May 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r13341 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/msg
by FreeSWITCH SVN 15 May '09

15 May '09

Author: mikej Date: Fri May 15 11:09:12 2009 New Revision: 13341 Log: Wed May 13 11:37:19 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * msg: unobfuscated casts of msg_header_t Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_auth.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_basic.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_generic.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Fri May 15 11:09:12 2009 @@ -1 +1 @@ -Fri May 15 11:07:28 CDT 2009 +Fri May 15 11:08:48 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_auth.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_auth.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_auth.c Fri May 15 11:09:12 2009 @@ -130,7 +130,7 @@ */ isize_t msg_auth_dup_xtra(msg_header_t const *h, isize_t offset) { - msg_auth_t const *au = h->sh_auth; + msg_auth_t const *au = (msg_auth_t *)h; MSG_PARAMS_SIZE(offset, au->au_params); offset += MSG_STRING_SIZE(au->au_scheme); @@ -144,8 +144,8 @@ char *b, isize_t xtra) { - msg_auth_t *au = dst->sh_auth; - msg_auth_t const *o = src->sh_auth; + msg_auth_t *au = (msg_auth_t *)dst; + msg_auth_t const *o = (msg_auth_t const *)src; char *end = b + xtra; b = msg_params_dup(&au->au_params, o->au_params, b, xtra); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_basic.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_basic.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_basic.c Fri May 15 11:09:12 2009 @@ -235,8 +235,10 @@ /** Parse payload. */ issize_t msg_payload_d(su_home_t *home, msg_header_t *h, char *s, isize_t slen) { - h->sh_payload->pl_len = slen; - h->sh_payload->pl_data = s; + msg_payload_t *pl = (msg_payload_t *)h; + + pl->pl_len = slen; + pl->pl_data = s; h->sh_len = slen; h->sh_data = s; @@ -246,11 +248,14 @@ issize_t msg_payload_e(char b[], isize_t bsiz, msg_header_t const *h, int flags) { - size_t len = h->sh_payload->pl_len; + msg_payload_t *pl = (msg_payload_t *)h; + size_t len = pl->pl_len; if (bsiz > 0) { - memcpy(b, h->sh_payload->pl_data, bsiz > len ? len : bsiz); - b[bsiz > len ? len : bsiz - 1] = '\0'; + if (len < bsiz) + memcpy(b, pl->pl_data, len), b[len] = '\0'; + else + memcpy(b, pl->pl_data, bsiz - 1), b[bsiz - 1] = '\0'; } return len; @@ -258,7 +263,8 @@ isize_t msg_payload_dup_xtra(msg_header_t const *h, isize_t offset) { - return offset + h->sh_payload->pl_len + 1; + msg_payload_t *pl = (msg_payload_t *)h; + return offset + pl->pl_len + 1; } char *msg_payload_dup_one(msg_header_t *dst, @@ -266,13 +272,13 @@ char *b, isize_t xtra) { - msg_payload_t *pl = dst->sh_payload; - msg_payload_t const *o = src->sh_payload; + msg_payload_t *pl = (msg_payload_t *)dst; + msg_payload_t const *o = (msg_payload_t const *)src; memcpy(pl->pl_data = b, o->pl_data, pl->pl_len = o->pl_len); - pl->pl_common->h_data = pl->pl_data; - pl->pl_common->h_len = pl->pl_len; + dst->sh_data = pl->pl_data; + dst->sh_len = pl->pl_len; pl->pl_data[pl->pl_len] = 0; /* NUL terminate just in case */ @@ -322,12 +328,13 @@ issize_t msg_separator_d(su_home_t *home, msg_header_t *h, char *s, isize_t slen) { int len = CRLF_TEST(s); + msg_separator_t *sep = (msg_separator_t *)h; if (len == 0 && slen > 0) return -1; - memcpy(h->sh_separator->sep_data, s, len); - h->sh_separator->sep_data[len] = '\0'; + memcpy(sep->sep_data, s, len); + sep->sep_data[len] = '\0'; return 0; } @@ -335,19 +342,20 @@ /** Encode a separator line. */ issize_t msg_separator_e(char b[], isize_t bsiz, msg_header_t const *h, int flags) { - size_t n = strlen(h->sh_separator->sep_data); + msg_separator_t const *sep = (msg_separator_t const *)h; + size_t n = strlen(sep->sep_data); if (bsiz > n) - strcpy(b, h->sh_separator->sep_data); + strcpy(b, sep->sep_data); return (issize_t)n; } msg_separator_t *msg_separator_create(su_home_t *home) { - msg_separator_t *sep = - msg_header_alloc(home, msg_separator_class, 0)->sh_separator; + msg_separator_t *sep; + sep = (msg_separator_t *)msg_header_alloc(home, msg_separator_class, 0); if (sep) strcpy(sep->sep_data, CRLF); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_generic.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_generic.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_generic.c Fri May 15 11:09:12 2009 @@ -68,7 +68,8 @@ char *s, isize_t slen) { - h->sh_generic->g_string = s; + msg_generic_t *g = (msg_generic_t *)h; + g->g_string = s; return 0; } @@ -80,7 +81,7 @@ */ issize_t msg_generic_e(char b[], isize_t bsiz, msg_header_t const *h, int flags) { - msg_generic_t const *g = h->sh_generic; + msg_generic_t const *g = (msg_generic_t const *)h; size_t n = strlen(g->g_string); if (bsiz > n) @@ -92,7 +93,7 @@ /** Calculate the size of strings associated with a @c msg_generic_t object. */ isize_t msg_generic_dup_xtra(msg_header_t const *h, isize_t offset) { - msg_generic_t const *g = h->sh_generic; + msg_generic_t const *g = (msg_generic_t const *)h; return offset + MSG_STRING_SIZE(g->g_string); } @@ -102,8 +103,10 @@ char *b, isize_t xtra) { + msg_generic_t *g = (msg_generic_t *)dst; + msg_generic_t const *o = (msg_generic_t const *)src; char *end = b + xtra; - MSG_STRING_DUP(b, dst->sh_generic->g_string, src->sh_generic->g_string); + MSG_STRING_DUP(b, g->g_string, o->g_string); assert(b <= end); (void)end; return b; } @@ -117,7 +120,7 @@ uint32_t value = 0; issize_t retval = msg_uint32_d(&s, &value); - assert(x->x_common->h_class->hc_size >= sizeof *x); + assert(h->sh_class->hc_size >= sizeof *x); x->x_value = value; @@ -150,15 +153,17 @@ issize_t msg_list_d(su_home_t *home, msg_header_t *h, char *s, isize_t slen) { - return msg_commalist_d(home, &s, &h->sh_list->k_items, NULL); + msg_list_t *k = (msg_list_t *)h; + return msg_commalist_d(home, &s, &k->k_items, NULL); } issize_t msg_list_e(char b[], isize_t bsiz, msg_header_t const *h, int flags) { + msg_list_t *k = (msg_list_t *)h; int compact = MSG_IS_COMPACT(flags); char *b0 = b, *end = b + bsiz; - MSG_COMMALIST_E(b, end, h->sh_list->k_items, compact); + MSG_COMMALIST_E(b, end, k->k_items, compact); MSG_TERM_E(b, end); return b - b0; @@ -176,7 +181,8 @@ */ isize_t msg_list_dup_xtra(msg_header_t const *h, isize_t offset) { - MSG_PARAMS_SIZE(offset, h->sh_list->k_items); + msg_list_t const *k = (msg_list_t const *)h; + MSG_PARAMS_SIZE(offset, k->k_items); return offset; } @@ -185,10 +191,12 @@ char *b, isize_t xtra) { + msg_list_t *k = (msg_list_t *)dst; + msg_list_t const *o = (msg_list_t const *)src; char *end = b + xtra; - msg_param_t const ** items = (msg_param_t const **)&dst->sh_list->k_items; + msg_param_t const ** items = (msg_param_t const **)&k->k_items; - b = msg_params_dup(items, src->sh_list->k_items, b, xtra); + b = msg_params_dup(items, o->k_items, b, xtra); assert(b <= end); (void)end; Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser.c Fri May 15 11:09:12 2009 @@ -1003,7 +1003,7 @@ /** Extract a header. */ issize_t msg_extract_header(msg_t *msg, msg_pub_t *mo, - char b[], isize_t bsiz, int eos) + char b[], isize_t bsiz, int eos) { return extract_header(msg, mo, b, bsiz, eos, 0); } @@ -1143,6 +1143,7 @@ /* XXX - This should be done by msg_header_free_all() */ msg_header_t *h_next; msg_param_t *h_params; + msg_error_t *er; while (h) { h_next = h->sh_next; @@ -1157,10 +1158,12 @@ /* XXX - This should be done by msg_header_free_all() */ hr = msg->m_class->mc_error; h = msg_header_alloc(home, hr->hr_class, 0); - if (!h) - return h; + er = (msg_error_t *)h; - h->sh_error->er_name = hc->hc_name; + if (!er) + return NULL; + + er->er_name = hc->hc_name; hh = (msg_header_t **)((char *)mo + hr->hr_offset); } }

1 0

[commit] r13340 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/msg
by FreeSWITCH SVN 15 May '09

15 May '09

Author: mikej Date: Fri May 15 11:07:59 2009 New Revision: 13340 Log: Wed May 13 11:18:27 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * msg_header_copy.c: unobfuscated msg_default_dup_one() Ignore-this: 1fda1941baecad1f6397de453e606f1c Coverity issue. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_header_copy.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Fri May 15 11:07:59 2009 @@ -1 +1 @@ -Fri May 15 11:06:55 CDT 2009 +Fri May 15 11:07:28 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_header_copy.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_header_copy.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_header_copy.c Fri May 15 11:07:59 2009 @@ -346,9 +346,9 @@ char *b, isize_t xtra) { - memcpy(&h->sh_header_next[1], - &src->sh_header_next[1], - h->sh_class->hc_size - offsetof(msg_header_t, sh_header_next[1])); + size_t skip = offsetof(msg_numeric_t, x_value); /* Skip common part */ + + memcpy((char *)h + skip, (char const *)src + skip, h->sh_class->hc_size - skip); return b; }

1 0

[commit] r13339 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/sip
by FreeSWITCH SVN 15 May '09

15 May '09

Author: mikej Date: Fri May 15 11:07:05 2009 New Revision: 13339 Log: Wed May 13 11:09:06 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * sip_parser.c: fixed overrrun in sip_method_name() Ignore-this: efe0fc0935451b1b0ee403befac5df40 Coverity issue. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_parser.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Fri May 15 11:07:05 2009 @@ -1 +1 @@ -Fri May 15 11:06:28 CDT 2009 +Fri May 15 11:06:55 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_parser.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_parser.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_parser.c Fri May 15 11:07:05 2009 @@ -335,7 +335,7 @@ char const *sip_method_name(sip_method_t method, char const *name) { const size_t N = sizeof(sip_method_names)/sizeof(sip_method_names[0]); - if (method > 0 && (size_t)method <= N) + if (method > 0 && (size_t)method < N) return sip_method_names[method]; else if (method == 0) return name;

1 0

[commit] r13338 - in freeswitch/trunk/libs/sofia-sip: . utils
by FreeSWITCH SVN 15 May '09

15 May '09

Author: mikej Date: Fri May 15 11:06:43 2009 New Revision: 13338 Log: Wed May 13 11:07:04 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * sip-dig.c: fixed buffer overrun Ignore-this: d8776bd28ef951602449e87d80dc20e7 Coverity issue. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/utils/sip-dig.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Fri May 15 11:06:43 2009 @@ -1 +1 @@ -Fri May 15 11:05:48 CDT 2009 +Fri May 15 11:06:28 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/utils/sip-dig.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/utils/sip-dig.c (original) +++ freeswitch/trunk/libs/sofia-sip/utils/sip-dig.c Fri May 15 11:06:43 2009 @@ -52,7 +52,6 @@ * The @e sip-dig utility accepts following command line options: * <dl> * <dt>-p <em>protoname</em></dt> - * <dd>Use named transport protocol. The <em>protoname</em> can be either * well-known, e.g., "udp", or it can specify NAPTR service and SRV * identifier, e.g., "tls-udp/SIPS+D2U/_sips._udp.". @@ -160,7 +159,7 @@ unsigned preference, ip4, ip6, sips, print; - struct transport tports[N_TPORT]; + struct transport tports[N_TPORT + 1]; }; int dig_naptr(struct dig *dig, char const *host, double weight); @@ -370,7 +369,7 @@ struct transport *tports = dig->tports; int j; - for (j = 0; j < N_TPORT - 1; j++) { + for (j = 0; j < N_TPORT; j++) { if (!tports[j].name) break; if (su_casematch(tports[j].name, tport))

1 0

[commit] r13337 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/iptsec
by FreeSWITCH SVN 15 May '09

15 May '09

Author: mikej Date: Fri May 15 11:05:59 2009 New Revision: 13337 Log: Wed May 13 11:00:40 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * auth_client.c: removed leak in auc_digest_authorization() Ignore-this: 9b0297083b6c6ce1bf9ef3d723b01f3b Coverity issue. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_client.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Fri May 15 11:05:59 2009 @@ -1 +1 @@ -Fri May 15 11:04:52 CDT 2009 +Fri May 15 11:05:48 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_client.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_client.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_client.c Fri May 15 11:05:59 2009 @@ -919,9 +919,9 @@ auth_challenge_t const *ac = cda->cda_ac; char const *cnonce = cda->cda_cnonce; unsigned nc = ++cda->cda_ncount; - char *uri = url_as_string(home, url); void const *data = body ? body->pl_data : ""; usize_t dlen = body ? body->pl_len : 0; + char *uri; msg_header_t *h; auth_hexmd5_t sessionkey, response; @@ -942,7 +942,10 @@ ar->ar_qop = NULL; ar->ar_auth = ac->ac_auth; ar->ar_auth_int = ac->ac_auth_int; - ar->ar_uri = uri; + ar->ar_uri = uri = url_as_string(home, url); + + if (ar->ar_uri == NULL) + return -1; /* If there is no qop, we MUST NOT include cnonce or nc */ if (!ar->ar_auth && !ar->ar_auth_int)

1 0

[commit] r13336 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/msg
by FreeSWITCH SVN 15 May '09

15 May '09

Author: mikej Date: Fri May 15 11:05:15 2009 New Revision: 13336 Log: Wed May 13 10:50:41 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * msg: fixed possible leak in msg_params_d() with more than 16 params Ignore-this: a45ef326def7b1bcd14de4850f3c24ab Coverity issue. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser_util.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/test_msg.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Fri May 15 11:05:15 2009 @@ -1 +1 @@ -Fri May 15 11:04:08 CDT 2009 +Fri May 15 11:04:52 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser_util.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser_util.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_parser_util.c Fri May 15 11:05:15 2009 @@ -415,12 +415,14 @@ if (n == N) { /* Reallocate params */ - char **nparams = su_alloc(home, - (N = MSG_PARAMS_NUM(N + 1)) * sizeof(*params)); + char const **nparams = su_realloc(home, params != stack ? params : NULL, + (N = MSG_PARAMS_NUM(N + 1)) * sizeof(*params)); if (!nparams) { goto error; } - params = memcpy(nparams, params, n * sizeof(*params)); + if (params == stack) + memcpy(nparams, stack, n * sizeof(*params)); + params = nparams; } params[n++] = p; @@ -441,12 +443,14 @@ } else if (n == N) { /* Reallocate params */ - char **nparams = su_alloc(home, - (N = MSG_PARAMS_NUM(N + 1)) * sizeof(*params)); + char const **nparams = su_realloc(home, params != stack ? params : NULL, + (N = MSG_PARAMS_NUM(N + 1)) * sizeof(*params)); if (!nparams) { goto error; } - params = memcpy(nparams, params, n * sizeof(*params)); + if (params == stack) + memcpy(nparams, stack, n * sizeof(*params)); + params = nparams; } params[n] = NULL; Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/test_msg.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/test_msg.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/test_msg.c Fri May 15 11:05:15 2009 @@ -285,6 +285,24 @@ su_free(home, (void *)p), p = NULL; } + master = ";0"; + + for (i = 1; i < 256; i++) { + master = su_sprintf(home, "%s; %u", master, i); TEST_1(master); + list = end = su_strdup(home, master); + TEST_1(msg_params_d(NULL, &end, &p) >= 0); + TEST_S(end, ""); + TEST_1(p); + for (j = 0; j <= i; j++) { + char number[10]; + snprintf(number, sizeof number, "%u", j); + TEST_S(p[j], number); + } + TEST_1(p[i + 1] == NULL); + su_free(home, list); + su_free(NULL, (void *)p), p = NULL; + } + su_home_deinit(home); } @@ -722,6 +740,8 @@ TEST(msg_serialize(msg, (msg_pub_t *)tst), 0); } + msg_destroy(msg); + /* Bug #2429 */ orig = read_msg("GET a-life HTTP/1.1" CRLF "Foo: bar" CRLF @@ -734,6 +754,7 @@ TEST_1(otst); msg = msg_copy(orig); + msg_destroy(orig); tst = msg_test_public(msg); TEST_1(tst);

1 0

[commit] r13335 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/tport
by FreeSWITCH SVN 15 May '09

15 May '09

Author: mikej Date: Fri May 15 11:04:28 2009 New Revision: 13335 Log: Wed May 13 05:14:56 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * tport.c: better checking of IP6 addresses Ignore-this: 49f502ccaaf771abed1e5b2d00eaa8b8 Coverity issue. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Fri May 15 11:04:28 2009 @@ -1 +1 @@ -Fri May 15 11:03:27 CDT 2009 +Fri May 15 11:04:08 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c Fri May 15 11:04:28 2009 @@ -1593,7 +1593,7 @@ enum tport_via public, tagi_t *tags) { - char hostname[256]; + char hostname[TPORT_HOSTPORTSIZE]; char const *canon = NULL, *host, *service; int error = 0, not_supported, family = 0; tport_primary_t *pri = NULL, **tbf; @@ -1613,10 +1613,12 @@ host = NULL; } #ifdef SU_HAVE_IN6 - else if (tpn->tpn_host && tpn->tpn_host[0] == '[') { + else if (host_is_ip6_reference(tpn->tpn_host)) { /* Remove [] around IPv6 addresses. */ - host = strcpy(hostname, tpn->tpn_host + 1); - hostname[strlen(hostname) - 1] = '\0'; + size_t len = strlen(tpn->tpn_host); + assert(len < sizeof hostname); + host = memcpy(hostname, tpn->tpn_host + 1, len - 2); + hostname[len - 2] = '\0'; } #endif else @@ -3986,29 +3988,21 @@ hints->ai_socktype = self->tp_addrinfo->ai_socktype; hints->ai_protocol = self->tp_addrinfo->ai_protocol; -#if HAVE_OPEN_C - if (host_is_ip_address(tpn->tpn_host)) - hints->ai_flags |= AI_NUMERICHOST; -#endif - - if (tpn->tpn_host[0] == '[') { + if (host_is_ip6_reference(tpn->tpn_host)) { /* Remove [] around IPv6 address */ - char *end; + size_t len = strlen(tpn->tpn_host); + assert(len < sizeof ipaddr); + host = memcpy(ipaddr, tpn->tpn_host + 1, len - 2); + ipaddr[len - 2] = '\0'; hints->ai_flags |= AI_NUMERICHOST; - host = strncpy(ipaddr, tpn->tpn_host + 1, sizeof(ipaddr) - 1); - ipaddr[sizeof(ipaddr) - 1] = '\0'; - - if ((end = strchr(host, ']'))) { - *end = 0; - } - else { - SU_DEBUG_3(("tport_resolve: bad IPv6 address\n")); - msg_set_errno(msg, EINVAL); - return -1; - } } - else + else { +#if HAVE_OPEN_C + if (host_is_ip_address(tpn->tpn_host)) + hints->ai_flags |= AI_NUMERICHOST; +#endif host = tpn->tpn_host; + } if ((error = su_getaddrinfo(host, tpn->tpn_port, hints, &res))) { SU_DEBUG_3(("tport_resolve: getaddrinfo(\"%s\":%s): %s\n",

1 0

[commit] r13334 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by FreeSWITCH SVN 15 May '09

15 May '09

Author: mikej Date: Fri May 15 11:03:45 2009 New Revision: 13334 Log: Wed May 13 04:19:01 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * outbound.c: logging string after freeing it. Ignore-this: 78c744681a08302beaa01b3752bd5f43 Coverity issue. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Fri May 15 11:03:45 2009 @@ -1 +1 @@ -Fri May 15 11:03:00 CDT 2009 +Fri May 15 11:03:27 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c Fri May 15 11:03:45 2009 @@ -309,13 +309,12 @@ } invalid = s && s[0]; - su_free(NULL, options); - - if (invalid) { + if (invalid) SU_DEBUG_1(("outbound(%p): invalid options \"%s\"\n", (void *)ob->ob_owner, options)); + su_free(NULL, options); + if (invalid) return -1; - } if (prefs->natify && !(prefs->outbound ||

1 0

[commit] r13333 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/soa
by FreeSWITCH SVN 15 May '09

15 May '09

Author: mikej Date: Fri May 15 11:03:07 2009 New Revision: 13333 Log: Tue May 12 14:58:43 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * test_soa: check larger sessions Ignore-this: fac46a2328bc0db501cd98e7a67309c0 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/test_soa.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Fri May 15 11:03:07 2009 @@ -1 +1 @@ -Fri May 15 11:02:00 CDT 2009 +Fri May 15 11:03:00 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/test_soa.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/test_soa.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/test_soa.c Fri May 15 11:03:07 2009 @@ -1878,6 +1878,175 @@ } +int test_large_sessions(struct context *ctx) +{ + BEGIN(); + int n; + + soa_session_t *a, *b; + + char const *offer = NONE, *answer = NONE; + isize_t offerlen = (isize_t)-1, answerlen = (isize_t)-1; + + sdp_session_t const *a_sdp, *b_sdp; + sdp_media_t const *m; + + char const a_caps[] = + "v=0\r\n" + "o=a 432432423423 2 IN IP4 127.0.0.2\r\n" + "c=IN IP4 127.0.0.2\r\n" + "m=image 5556 UDPTL t38\r\n" + "m=audio 5004 RTP/AVP 0 8\n" + ; + + char const a_caps2[] = + "v=0\r\n" + "o=a 432432423423 2 IN IP4 127.0.0.2\r\n" + "c=IN IP4 127.0.0.2\r\n" + "m=image 5556 UDPTL t38\r\n" + "m=audio 5004 RTP/AVP 0\n" + "m=audio1 5006 RTP/AVP 8\n" + "m=audio2 5008 RTP/AVP 3\n" + "m=audio3 5010 RTP/AVP 9\n" + "m=audio4 5010 RTP/AVP 15\n" + ; + + char const b_caps[] = + "v=0\r\n" + "o=left 219498671 2 IN IP4 127.0.0.2\r\n" + "c=IN IP4 127.0.0.2\r\n" + "m=audio 5008 RTP/AVP 0 8\r\n" + ; + + char const b_caps2[] = + "v=0\r\n" + "o=left 219498671 2 IN IP4 127.0.0.2\r\n" + "c=IN IP4 127.0.0.2\r\n" + "m=audio 5008 RTP/AVP 0 8\r\n" + "m=image 5008 UDPTL t38\r\n" + "m=audio00 5008 RTP/AVP 0 8\r\n" + "m=audio01 5006 RTP/AVP 8\n" + "m=audio02 5008 RTP/AVP 3\n" + "m=audio03 5010 RTP/AVP 9\n" + "m=audio04 5010 RTP/AVP 15\n" + ; + + TEST_1(a = soa_create("static", ctx->root, ctx)); + TEST_1(b = soa_create("static", ctx->root, ctx)); + + TEST_1(soa_set_params(a, SOATAG_ORDERED_USER(1), + TAG_END()) > 0); + TEST_1(soa_set_params(b, SOATAG_ORDERED_USER(1), + TAG_END()) > 0); + + TEST(soa_set_user_sdp(a, 0, a_caps, strlen(a_caps)), 1); + TEST(soa_set_user_sdp(b, 0, b_caps, strlen(b_caps)), 1); + + n = soa_generate_offer(a, 1, test_completed); TEST(n, 0); + n = soa_get_local_sdp(a, NULL, &offer, &offerlen); TEST(n, 1); + TEST_1(offer != NULL && offer != NONE); + /* printf("offer1: %s\n", offer); */ + n = soa_set_remote_sdp(b, 0, offer, offerlen); TEST(n, 1); + n = soa_get_local_sdp(b, NULL, &answer, &answerlen); TEST(n, 0); + n = soa_generate_answer(b, test_completed); TEST(n, 0); + n = soa_get_local_sdp(b, &b_sdp, &answer, &answerlen); TEST(n, 1); + TEST_1(answer != NULL && answer != NONE); + /* printf("answer1: %s\n", answer); */ + n = soa_set_remote_sdp(a, 0, answer, -1); TEST(n, 1); + n = soa_process_answer(a, test_completed); TEST(n, 0); + + n = soa_get_local_sdp(a, &a_sdp, NULL, NULL); TEST(n, 1); + + TEST_1(soa_is_complete(b)); + TEST(soa_activate(b, NULL), 0); + + TEST_1(soa_is_complete(a)); + TEST(soa_activate(a, NULL), 0); + + TEST(soa_is_audio_active(a), SOA_ACTIVE_SENDRECV); + TEST(soa_is_remote_audio_active(a), SOA_ACTIVE_SENDRECV); + + TEST_1(a_sdp->sdp_media); + TEST_1(a_sdp->sdp_media->m_type == sdp_media_image); + TEST_1(a_sdp->sdp_media->m_next); + TEST_1(a_sdp->sdp_media->m_next->m_type == sdp_media_audio); + + /* ---------------------------------------------------------------------- */ + /* Re-O/A - activate image, add incompatible m= lines */ + + TEST_1(soa_set_params(b, SOATAG_RTP_MISMATCH(0), + SOATAG_USER_SDP_STR(b_caps2), + SOATAG_REUSE_REJECTED(1), + TAG_END()) > 0); + + n = soa_generate_offer(b, 1, test_completed); TEST(n, 0); + n = soa_get_local_sdp(b, &b_sdp, &offer, &offerlen); TEST(n, 1); + TEST_1(offer != NULL && offer != NONE); + n = soa_set_remote_sdp(a, 0, offer, offerlen); TEST(n, 1); + /* printf("offer2: %s\n", offer); */ + + n = soa_generate_answer(a, test_completed); TEST(n, 0); + n = soa_get_local_sdp(a, &a_sdp, &answer, &answerlen); TEST(n, 1); + TEST_1(answer != NULL && answer != NONE); + /* printf("answer2: %s\n", answer); */ + n = soa_set_remote_sdp(b, 0, answer, -1); TEST(n, 1); + n = soa_process_answer(b, test_completed); TEST(n, 0); + n = soa_get_local_sdp(b, &b_sdp, NULL, NULL); TEST(n, 1); + + TEST_1(soa_is_complete(a)); + TEST(soa_activate(a, NULL), 0); + + TEST_1(soa_is_complete(b)); + TEST(soa_activate(b, NULL), 0); + + TEST_1(m = a_sdp->sdp_media); + TEST(m->m_type, sdp_media_image); TEST(m->m_proto, sdp_proto_udptl); + TEST_1(m->m_format); TEST_S(m->m_format->l_text, "t38"); + + TEST_1(m = b_sdp->sdp_media); + TEST(m->m_type, sdp_media_image); TEST(m->m_proto, sdp_proto_udptl); + TEST_1(m->m_format); TEST_S(m->m_format->l_text, "t38"); + + TEST(soa_is_audio_active(a), SOA_ACTIVE_SENDRECV); + TEST(soa_is_remote_audio_active(a), SOA_ACTIVE_SENDRECV); + + /* 2nd re-offer */ + /* Add even more incompatible lines */ + TEST_1(soa_set_params(a, SOATAG_RTP_MISMATCH(0), + SOATAG_USER_SDP_STR(a_caps2), + TAG_END()) > 0); + + n = soa_generate_offer(a, 1, test_completed); TEST(n, 0); + n = soa_get_local_sdp(a, NULL, &offer, &offerlen); TEST(n, 1); + TEST_1(offer != NULL && offer != NONE); + /* printf("offer3: %s\n", offer); */ + n = soa_set_remote_sdp(b, 0, offer, offerlen); TEST(n, 1); + n = soa_get_local_sdp(b, NULL, &answer, &answerlen); TEST(n, 1); + n = soa_generate_answer(b, test_completed); TEST(n, 0); + n = soa_get_local_sdp(b, &b_sdp, &answer, &answerlen); TEST(n, 1); + TEST_1(answer != NULL && answer != NONE); + /* printf("answer3: %s\n", answer); */ + n = soa_set_remote_sdp(a, 0, answer, -1); TEST(n, 1); + n = soa_process_answer(a, test_completed); TEST(n, 0); + + n = soa_get_local_sdp(a, &a_sdp, NULL, NULL); TEST(n, 1); + + TEST_1(soa_is_complete(b)); + TEST(soa_activate(b, NULL), 0); + + TEST_1(soa_is_complete(a)); + TEST(soa_activate(a, NULL), 0); + + TEST_VOID(soa_terminate(a, NULL)); + TEST_VOID(soa_terminate(b, NULL)); + + TEST_VOID(soa_destroy(a)); + TEST_VOID(soa_destroy(b)); + + END(); +} + + int test_asynch_offer_answer(struct context *ctx) { BEGIN(); @@ -2536,7 +2705,7 @@ if (retval == 0) { retval |= test_address_selection(ctx); SINGLE_FAILURE_CHECK(); - + retval |= test_large_sessions(ctx); SINGLE_FAILURE_CHECK(); retval |= test_params(ctx); SINGLE_FAILURE_CHECK(); retval |= test_static_offer_answer(ctx); SINGLE_FAILURE_CHECK(); retval |= test_codec_selection(ctx); SINGLE_FAILURE_CHECK();

1 0

[commit] r13332 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/soa
by FreeSWITCH SVN 15 May '09

15 May '09

Author: mikej Date: Fri May 15 11:02:34 2009 New Revision: 13332 Log: Tue May 12 14:57:48 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * soa_static.c: avoid overrun of arrays in soa_sdp_upgrade() Ignore-this: 9f7eae37e7d97c509a2797363b03c54a Coverity issue. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Fri May 15 11:02:34 2009 @@ -1 +1 @@ -Fri May 15 11:01:11 CDT 2009 +Fri May 15 11:02:00 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c Fri May 15 11:02:34 2009 @@ -716,7 +716,7 @@ { soa_static_session_t *sss = (soa_static_session_t *)ss; - int Ns, Nu, Nr, size, i, j; + int Ns, Nu, Nr, Nmax, n, i, j; sdp_media_t *m, **mm, *um; sdp_media_t **s_media, **o_media, **u_media; sdp_media_t const *rm, **r_media; @@ -730,13 +730,13 @@ Nr = sdp_media_count(remote, sdp_media_any, 0, 0, 0); if (remote == NULL) - size = Ns + Nu + 1; + Nmax = Ns + Nu; else if (Ns < Nr) - size = Nr + 1; + Nmax = Nr; else - size = Ns + 1; + Nmax = Ns; - s_media = su_zalloc(home, size * (sizeof *s_media)); + s_media = su_zalloc(home, (Nmax + 1) * (sizeof *s_media)); o_media = su_zalloc(home, (Ns + 1) * (sizeof *o_media)); u_media = su_zalloc(home, (Nu + 1) * (sizeof *u_media)); r_media = su_zalloc(home, (Nr + 1) * (sizeof *r_media)); @@ -748,17 +748,17 @@ return -1; u2s = su_alloc(home, (Nu + 1) * sizeof(*u2s)); - s2u = su_alloc(home, size * sizeof(*s2u)); + s2u = su_alloc(home, (Nmax + 1) * sizeof(*s2u)); if (!u2s || !s2u) return -1; for (i = 0; i < Nu; i++) u2s[i] = U2S_NOT_USED; - u2s[i] = U2S_SENTINEL; + u2s[Nu] = U2S_SENTINEL; - for (i = 0; i <= size; i++) + for (i = 0; i < Nmax; i++) s2u[i] = U2S_NOT_USED; - s2u[i] = U2S_SENTINEL; + s2u[Nmax] = U2S_SENTINEL; for (i = 0, m = session->sdp_media; m && i < Ns; m = m->m_next) o_media[i++] = m; @@ -778,6 +778,7 @@ continue; if (j >= Nu) /* lines removed from user SDP */ continue; + assert(i < Ns); s_media[i] = u_media[j], u_media[j] = SDP_MEDIA_NONE; u2s[j] = i, s2u[i] = j; } @@ -834,7 +835,7 @@ if (u_media[j] == SDP_MEDIA_NONE) continue; - for (i = 0; i < size - 1; i++) { + for (i = 0; i < Nmax; i++) { if (s_media[i] == NULL) { s_media[i] = u_media[j], u_media[j] = SDP_MEDIA_NONE; u2s[j] = i, s2u[i] = j; @@ -842,7 +843,7 @@ } } - assert(i != size - 1); + assert(i != Nmax); } } @@ -869,7 +870,7 @@ i++; } } - assert(i <= size); + assert(i <= Nmax); } mm = &session->sdp_media; @@ -878,7 +879,7 @@ } *mm = NULL; - s2u[size = i] = U2S_SENTINEL; + s2u[n = i] = U2S_SENTINEL; *return_u2s = u2s; *return_s2u = s2u; @@ -887,7 +888,7 @@ i = u2s[j]; assert(i == U2S_NOT_USED || s2u[i] == j); } - for (i = 0; i < size; i++) { + for (i = 0; i < n; i++) { j = s2u[i]; assert(j == U2S_NOT_USED || u2s[j] == i); }

1 0