[SR-Dev] git:master: Support for mixed content type.

[Jan Janak]

Module: sip-router
Branch: master
Commit: 44a06042caaf45156862e71e654c781cd5b9332c
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=44a06042caaf45156862e71e654c781cd5b9332c

Author: Ovidiu Sas <osas at voipembedded.com>
Committer: Jan Janak <jan at iptel.org>
Date:   Tue Mar 24 15:14:53 2009 +0100

Support for mixed content type.

This patch extendes the content type parser and adds support for
content type mixed.

Signed-off-by: Jan Janak <jan at iptel.org>

---

 parser/parse_content.c |   10 +++++++---
 parser/parse_content.h |    1 +
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/parser/parse_content.c b/parser/parse_content.c
index 985c13b..6e3c5bc 100644
--- a/parser/parse_content.c
+++ b/parser/parse_content.c
@@ -193,7 +193,7 @@ static type_node_t subtype_tree[] = {
 												{'i',SUBTYPE_UNKNOWN,1,-1}, 
 													{'d',SUBTYPE_UNKNOWN,1,-1},
 														{'f',SUBTYPE_XML_MSRTC_PIDF,0,-1},
-	{'e',SUBTYPE_UNKNOWN,1,-1}, /* 94 */
+	{'e',SUBTYPE_UNKNOWN,1,107}, /* 94 */
 		{'x',SUBTYPE_UNKNOWN,1,-1},
 			{'t',SUBTYPE_UNKNOWN,1,-1},
 				{'e',SUBTYPE_UNKNOWN,1,-1},
@@ -206,8 +206,12 @@ static type_node_t subtype_tree[] = {
 											{'o',SUBTYPE_UNKNOWN,1,-1},
 												{'d',SUBTYPE_UNKNOWN,1,-1},
 													{'y',SUBTYPE_EXTERNAL_BODY,0,-1},
-
-	};
+	{'m',SUBTYPE_UNKNOWN,1,-1}, /* 107 */
+		{'i',SUBTYPE_UNKNOWN,1,-1},
+			{'x',SUBTYPE_UNKNOWN,1,-1},
+				{'e',SUBTYPE_UNKNOWN,1,-1},
+					{'d',SUBTYPE_MIXED,0,-1},
+};
 
 
 
diff --git a/parser/parse_content.h b/parser/parse_content.h
index c2b1a9f..0bc08ff 100644
--- a/parser/parse_content.h
+++ b/parser/parse_content.h
@@ -62,6 +62,7 @@ struct mime_type {
 #define SUBTYPE_EXTERNAL_BODY      11
 #define SUBTYPE_XML_MSRTC_PIDF     12
 #define SUBTYPE_CPIM_PIDFXML       13
+#define SUBTYPE_MIXED              14
 #define SUBTYPE_ALL          0xfe
 #define SUBTYPE_UNKNOWN      0xff