Skip to content

S
sofia-sip
Commit e5adfb18 authored by Fabio Margarido fabiomargarido AT gmail DOT com's avatar Fabio Margarido fabiomargarido AT gmail DOT com
Browse files
Options

msg: allow compact headers inside multipart payload 

Ignore-this: 2cc5844f4be7e64677568a2b1b9563d

darcs-hash:20090304193537-945f2-0ade3ca2804b2ce4885bff2a8be1c533f856d84c.gz
parent 0edd12a1
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 11 deletions
libsofia-sip-ua/msg/Makefile.am
View file @ e5adfb18
......@@ -87,7 +87,7 @@ MSG_PARSER_AWK = $(srcdir)/msg_parser.awk
AWK_MSG_AWK = LC_ALL=C $(AWK) -f $(MSG_PARSER_AWK)
${GENERATED_HC}: ${MSG_PARSER_AWK}
${GENERATED_HC}: ${MSG_PARSER_AWK} Makefile.am
TEST_CLASS_H = ${srcdir}/test_class.h
......
libsofia-sip-ua/msg/sofia-sip/msg_mime.h
View file @ e5adfb18
......@@ -168,13 +168,13 @@ struct msg_multipart_s
msg_error_t *mp_error;
/* === Headers start here */
msg_content_type_t *mp_content_type; /**< Content-Type */
msg_content_type_t *mp_content_type; /**< Content-Type (c) */
msg_content_disposition_t *mp_content_disposition;
/**< Content-Disposition */
msg_content_location_t *mp_content_location; /**< Content-Location */
msg_content_id_t *mp_content_id; /**< Content-ID */
msg_content_language_t *mp_content_language; /**< Content-Language */
msg_content_encoding_t *mp_content_encoding; /**< Content-Encoding */
msg_content_encoding_t *mp_content_encoding; /**< Content-Encoding (e) */
msg_content_transfer_encoding_t *mp_content_transfer_encoding;
/**< Content-Transfer-Encoding */
#if 0
......
libsofia-sip-ua/msg/test_msg.c
View file @ e5adfb18
......@@ -1193,8 +1193,15 @@ int test_mime(void)
CRLF /* 13 */
#define BODY3 "<html><body>part 3</body></html>" CRLF
BODY3 /* 14 */
CRLF /* 15 */
"--LaGqGt4BI6Ho--" CRLF;
CRLF "--LaGqGt4BI6Ho" /* 15 */
"c: text/html" CRLF /* 16 */
"l: 9" CRLF /* 17 */
"e: identity" CRLF /* 18 */
CRLF /* 19 */
#define BODY4 "<html/>" CRLF
BODY4 /* 20 */
CRLF "--LaGqGt4BI6Ho--" /* 21 */
CRLF;
BEGIN();
......@@ -1275,6 +1282,18 @@ int test_mime(void)
TEST_SIZE(strlen(BODY3), pl->pl_len);
TEST(memcmp(pl->pl_data, BODY3, pl->pl_len), 0);
TEST_1(mp = mp->mp_next);
TEST_1(mp->mp_data);
TEST_M(mp->mp_data, CRLF "--" "LaGqGt4BI6Ho" CRLF, mp->mp_len);
TEST_1(mp->mp_content_encoding);
TEST_1(mp->mp_content_type);
TEST_1(pl = mp->mp_payload); TEST_1(pl->pl_data);
TEST_SIZE(strlen(BODY4), pl->pl_len);
TEST(memcmp(pl->pl_data, BODY4, pl->pl_len), 0);
mpX = mp;
TEST_1(!(mp = mp->mp_next));
......@@ -1293,7 +1312,7 @@ int test_mime(void)
h->sh_succ = NULL;
}
TEST(n, 15);
TEST(n, 21);
head = NULL;
TEST_1(h = msg_multipart_serialize(&head, mp0));
......@@ -1304,7 +1323,7 @@ int test_mime(void)
h_succ = h->sh_succ;
}
TEST(n, 15);
TEST(n, 21);
/* Add a new part to multipart */
mpnew = su_zalloc(home, sizeof(*mpnew)); TEST_1(mpnew);
......@@ -1324,7 +1343,7 @@ int test_mime(void)
TEST_1(h != removed);
}
TEST(n, 19);
TEST(n, 21 + 4);
#define remove(h) \
(((*((msg_header_t*)(h))->sh_prev = ((msg_header_t*)(h))->sh_succ) ? \
......@@ -1336,7 +1355,7 @@ int test_mime(void)
remove(mp0->mp_separator);
remove(mp0->mp_next->mp_payload);
remove(mp0->mp_next->mp_next->mp_content_type);
remove(mp0->mp_next->mp_next->mp_next->mp_close_delim);
remove(mp0->mp_next->mp_next->mp_next->mp_next->mp_close_delim);
TEST_1(!msg_chain_errors((msg_header_t *)mp0));
......@@ -1352,7 +1371,7 @@ int test_mime(void)
TEST_1(h != removed);
}
TEST(n, 19);
TEST(n, 21 + 4);
/* Add an recursive multipart */
mpnew = su_zalloc(home, sizeof(*mpnew)); TEST_1(mpnew);
......@@ -1371,7 +1390,7 @@ int test_mime(void)
for (h = (msg_header_t *)mp0, n = 0; h; h = h_succ, n++)
h_succ = h->sh_succ;
TEST(n, 24);
TEST(n, 21 + 9);
su_home_check(home);
su_home_zap(home);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment