- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r8621 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/su
by Freeswitch SVN 25 May '08

25 May '08

Author: mikej Date: Sun May 25 11:10:04 2008 New Revision: 8621 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c Log: Tue May 20 13:28:44 EDT 2008 Pekka.Pessi(a)nokia.com * su_alloc.c: fixed klocworks issues Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Sun May 25 11:10:04 2008 @@ -1 +1 @@ -Sun May 25 11:08:26 EDT 2008 +Sun May 25 11:09:54 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c Sun May 25 11:10:04 2008 @@ -1088,7 +1088,7 @@ else used = s->sub_used; - if ((used && d == NULL) || 3 * used > 2 * d->sub_n) { + if (used && (d == NULL || 3 * used > 2 * d->sub_n)) { if (d) for (n = n2 = d->sub_n; 3 * used > 2 * n2; n2 = 4 * n2 + 3) ; @@ -1122,7 +1122,9 @@ d = d2; } - if ((n = s->sub_n)) { + if (s->sub_used) { + n = s->sub_n; + for (i = 0; i < n; i++) if (s->sub_nodes[i].sua_data) { su_block_add(d, s->sub_nodes[i].sua_data)[0] = s->sub_nodes[i]; @@ -1134,6 +1136,7 @@ } if (s->sub_stats) { + /* XXX */ } } @@ -1649,7 +1652,7 @@ /** Retrieve statistics from memory home. */ void su_home_get_stats(su_home_t *home, int include_clones, - su_home_stat_t hs[1], + su_home_stat_t *hs, isize_t size) { su_block_t *sub; @@ -1657,7 +1660,7 @@ if (hs == NULL || size < (sizeof hs->hs_size)) return; - memset(hs, 0, size); + memset((void *)hs, 0, size); sub = MEMLOCK(home);

1 0

[commit] r8620 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/sresolv
by Freeswitch SVN 25 May '08

25 May '08

Author: mikej Date: Sun May 25 11:08:38 2008 New Revision: 8620 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_blocking.c Log: Tue May 20 12:15:42 EDT 2008 Pekka.Pessi(a)nokia.com * sres_blocking.c: fixed klocwork issues Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Sun May 25 11:08:38 2008 @@ -1 +1 @@ -Sun May 25 11:07:19 EDT 2008 +Sun May 25 11:08:26 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_blocking.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_blocking.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_blocking.c Sun May 25 11:08:38 2008 @@ -111,7 +111,7 @@ sres_socket_t new_socket, sres_socket_t old_socket) { - int i, N = b->n_sockets; + int i, N; if (b == NULL) return -1; @@ -123,6 +123,8 @@ return 0; } + N = b->n_sockets; + if (old_socket != INVALID_SOCKET) { for (i = 0; i < N; i++) { if (b->fds[i].fd == old_socket)

1 0

[commit] r8619 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/sresolv
by Freeswitch SVN 25 May '08

25 May '08

Author: mikej Date: Sun May 25 11:07:50 2008 New Revision: 8619 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c Log: Tue May 20 12:15:30 EDT 2008 Pekka.Pessi(a)nokia.com * sres.c: fixed klocwork issues Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Sun May 25 11:07:50 2008 @@ -1 +1 @@ -Sun May 25 11:06:22 EDT 2008 +Sun May 25 11:07:19 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c Sun May 25 11:07:50 2008 @@ -1026,7 +1026,10 @@ if (res->res_n_servers == 0) return (void)su_seterrno(ENETDOWN), (sres_query_t *)NULL; - if (sres_has_search_domain(res)) + if (domain[dlen - 1] == '.') + /* Domain ends with dot - do not search */ + dots = res->res_config->c_opt.ndots; + else if (sres_has_search_domain(res)) for (dots = 0, dot = strchr(domain, '.'); dots < res->res_config->c_opt.ndots && dot; dots++, dot = strchr(dot + 1, '.')) @@ -1045,6 +1048,8 @@ char const *const *domains = res->res_config->c_search; char search[SRES_MAXDNAME + 1]; + assert(dlen < SRES_MAXDNAME); + memcpy(search, domain, dlen); search[dlen++] = '.'; search[dlen] = '\0'; @@ -1062,7 +1067,9 @@ sub = sres_query_alloc(res, sres_answer_subquery, (void *)query, type, search); - if (sres_send_dns_query(res, sub) == 0) { + if (sub == NULL) { + } + else if (sres_send_dns_query(res, sub) == 0) { query->q_subqueries[i] = sub; } else { @@ -1430,7 +1437,10 @@ { int i, n; - for (n = 0, i = 0; answers && answers[i]; i++) { + if (res == NULL || answers == NULL) + return su_seterrno(EFAULT); + + for (n = 0, i = 0; answers[i]; i++) { if (answers[i]->sr_record->r_status || answers[i]->sr_record->r_class != sres_class_in || (type != 0 && answers[i]->sr_record->r_type != type)) { @@ -2010,6 +2020,10 @@ if (name_servers_length > MAX_DATALEN) break; name_servers = su_realloc(home, name_servers, name_servers_length); + if (name_servers == NULL) { + ret = ERROR_BUFFER_OVERFLOW; + break; + } } /* if reading the key was succesful, continue */ @@ -3411,23 +3425,26 @@ #define ADDRSIZE 48 #endif char host[ADDRSIZE] = "*"; + uint16_t port = 0; if (from == NULL) ; else if (from->ss_family == AF_INET) { struct sockaddr_in const *sin = (void *)from; su_inet_ntop(AF_INET, &sin->sin_addr, host, sizeof host); + port = sin->sin_port; } #if HAVE_SIN6 else if (from->ss_family == AF_INET6) { struct sockaddr_in6 const *sin6 = (void *)from; su_inet_ntop(AF_INET6, &sin6->sin6_addr, host, sizeof host); + port = sin6->sin6_port; } #endif SU_DEBUG_5(("sres_resolver_receive(%p, %p) id=%u (from [%s]:%u)\n", (void *)res, (void *)query, m->m_id, - host, ntohs(((struct sockaddr_in *)from)->sin_port))); + host, ntohs(port))); } } @@ -3447,7 +3464,7 @@ { sres_record_t *rr = NULL, **answers = NULL, *error = NULL; sres_query_t *query = NULL, **hq; - su_home_t *chome = CHOME(res->res_cache); + su_home_t *chome; hash_value_t hash; int err; unsigned i, total, errorcount = 0; @@ -3455,6 +3472,7 @@ assert(res && m && return_answers); time(&res->res_now); + chome = CHOME(res->res_cache); *qq = NULL; *return_answers = NULL; @@ -3737,8 +3755,9 @@ a6->a6_suffix.u6_addr[i] = m_get_uint8(m); if (a6->a6_prelen > 0) { - /* Zero pad bits */ - a6->a6_suffix.u6_addr[16 - suffixlen] &= 0xff >> (a6->a6_prelen & 7); + if (suffixlen > 0) + /* Zero pad bits */ + a6->a6_suffix.u6_addr[16 - suffixlen] &= 0xff >> (a6->a6_prelen & 7); offset = m->m_offset, prefixlen = m_get_domain(NULL, 0, m, 0) + 1;

1 0

[commit] r8618 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/soa
by Freeswitch SVN 25 May '08

25 May '08

Author: mikej Date: Sun May 25 11:06:27 2008 New Revision: 8618 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c Log: Tue May 20 09:35:46 EDT 2008 Pekka.Pessi(a)nokia.com * soa_static.c: fixed klocwork issues Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Sun May 25 11:06:27 2008 @@ -1 +1 @@ -Sun May 25 11:05:03 EDT 2008 +Sun May 25 11:06:22 EDT 2008 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 Sun May 25 11:06:27 2008 @@ -1117,6 +1117,8 @@ if (action == generate_offer) remote = NULL; + else if (remote == NULL) + return soa_set_status(ss, 500, "No remote SDP"); /* Pre-negotiation Step: Expand truncated remote SDP */ if (local && remote) switch (action) { @@ -1127,6 +1129,8 @@ SU_DEBUG_5(("%s: remote %s is truncated: expanding\n", by, action == generate_answer ? "offer" : "answer")); remote = soa_sdp_expand_media(tmphome, remote, local); + if (remote == NULL) + return soa_set_status(ss, 500, "Cannot expand remote session"); } default: break;

1 0

[commit] r8617 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/soa
by Freeswitch SVN 25 May '08

25 May '08

Author: mikej Date: Sun May 25 11:05:09 2008 New Revision: 8617 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa.c Log: Tue May 20 09:35:37 EDT 2008 Pekka.Pessi(a)nokia.com * soa.c: fixed klocwork issues Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Sun May 25 11:05:09 2008 @@ -1 +1 @@ -Sun May 25 11:03:45 EDT 2008 +Sun May 25 11:05:03 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa.c Sun May 25 11:05:09 2008 @@ -881,37 +881,41 @@ /** Set capabilities */ int -soa_base_set_capability_sdp(soa_session_t *ss, - sdp_session_t *sdp, char const *str0, isize_t len0) +soa_base_set_capability_sdp(soa_session_t *ss, + sdp_session_t *_sdp, + char const *str0, isize_t len0) { + sdp_session_t sdp[1]; sdp_origin_t o[1] = {{ sizeof(o) }}; sdp_connection_t *c, c0[1] = {{ sizeof(c0) }}; char c_address[64]; sdp_time_t t[1] = {{ sizeof(t) }}; sdp_media_t *m; + *sdp = *_sdp; + if (sdp->sdp_origin) *o = *sdp->sdp_origin; else o->o_address = c0; - sdp->sdp_origin = o; - if (soa_init_sdp_origin(ss, o, c_address) < 0) return -1; + sdp->sdp_origin = o; + if (!sdp->sdp_subject) - sdp->sdp_subject = "-"; + sdp->sdp_subject = "-"; /* s=- */ - sdp->sdp_time = t; + sdp->sdp_time = t; /* t=0 0 */ /* Set port to zero - or should we check that port is already zero? */ for (m = sdp->sdp_media; m; m = m->m_next) m->m_port = 0; - c = sdp->sdp_origin->o_address; - if (sdp->sdp_connection == NULL) { + c = sdp->sdp_origin->o_address; + for (m = sdp->sdp_media; m; m = m->m_next) if (m->m_connections == NULL) break; @@ -1977,6 +1981,9 @@ sdp_parser_t *parser = NULL; sdp_session_t sdp[1]; + if (ss == NULL) + return -1; + switch (what) { case soa_capability_sdp_kind: ssd = ss->ss_caps; @@ -1994,15 +2001,16 @@ return -1; } - if (sdp_str && str_len == -1) - str_len = strlen(sdp_str); - - if (sdp0) + if (sdp0) { new_version = sdp_session_cmp(sdp0, ssd->ssd_sdp) != 0; - else if (sdp_str) + sdp_str = NULL, str_len = -1; + } + else if (sdp_str) { + if (str_len == -1) + str_len = strlen(sdp_str); new_version = !ssd->ssd_unparsed || - str0ncmp(sdp_str, ssd->ssd_unparsed, str_len) != 0 || - ssd->ssd_unparsed[str_len] != '\0'; + str0ncmp(sdp_str, ssd->ssd_unparsed, str_len + 1) != 0; + } else return (void)su_seterrno(EINVAL), -1;

1 0

[commit] r8616 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/sip
by Freeswitch SVN 25 May '08

25 May '08

Author: mikej Date: Sun May 25 11:03:51 2008 New Revision: 8616 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/torture_sip.c Log: Tue May 20 09:33:08 EDT 2008 Pekka.Pessi(a)nokia.com * torture_sip.c: added test for Content-Type Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Sun May 25 11:03:51 2008 @@ -1 +1 @@ -Sun May 25 10:58:52 EDT 2008 +Sun May 25 11:03:45 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/torture_sip.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/torture_sip.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/torture_sip.c Sun May 25 11:03:51 2008 @@ -2227,7 +2227,6 @@ static int test_content_disposition(void) { - /* Test Accept header */ sip_content_disposition_t *cd, *cd0; su_home_t *home; @@ -2247,6 +2246,38 @@ END(); } + +static int test_content_type(void) +{ + sip_content_type_t *c; + sip_content_type_t c0[1]; + su_home_t *home; + + BEGIN(); + + TEST_1(home = su_home_create()); + TEST_1(c = sip_content_type_make(home, "application/sdp ; charset = utf-8")); + TEST_S(c->c_type, "application/sdp"); + TEST_S(c->c_subtype, "sdp"); + TEST_1(c->c_params && c->c_params[0] && !c->c_params[1]); + TEST_S(c->c_params[0], "charset=utf-8"); + TEST_P(c->c_params[1], NULL); + + sip_content_type_init(c0); + c = sip_content_type_dup(home, c0); + TEST_P(c->c_type, NULL); + TEST_P(c->c_subtype, NULL); + + c0->c_type = "text"; + c = sip_content_type_dup(home, c0); + TEST_S(c->c_type, "text"); + TEST_P(c->c_subtype, NULL); + + su_home_unref(home); + END(); +} + + static int test_www_authenticate(void) { sip_www_authenticate_t *www; @@ -3570,6 +3601,7 @@ retval |= test_refer(); fflush(stdout); retval |= test_route(); fflush(stdout); retval |= test_request_disposition(); fflush(stdout); + retval |= test_content_type(); fflush(stdout); retval |= test_caller_prefs(); fflush(stdout); retval |= test_callerpref_scoring(); fflush(stdout); retval |= test_warning(); fflush(stdout);

1 0

[commit] r8615 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/sip
by Freeswitch SVN 25 May '08

25 May '08

Author: mikej Date: Sun May 25 10:58:59 2008 New Revision: 8615 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_util.c Log: Tue May 20 09:32:50 EDT 2008 Pekka.Pessi(a)nokia.com * sip_util.c: fixed klocwork issues Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Sun May 25 10:58:59 2008 @@ -1 +1 @@ -Sun May 25 10:57:08 EDT 2008 +Sun May 25 10:58:52 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_util.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_util.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_util.c Sun May 25 10:58:59 2008 @@ -364,17 +364,17 @@ */ issize_t sip_header_field_d(su_home_t *home, sip_header_t *h, char *s, isize_t slen) { - assert(SIP_HDR_TEST(h)); - if (h && s && s[slen] == '\0') { size_t n = span_lws(s); s += n; slen -= n; - + for (n = slen; n >= 1 && IS_LWS(s[n - 1]); n--) ; s[n] = '\0'; + assert(SIP_HDR_TEST(h)); + return h->sh_class->hc_parse(home, h, s, slen); } else

1 0

[commit] r8614 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/sip
by Freeswitch SVN 25 May '08

25 May '08

Author: mikej Date: Sun May 25 10:57:14 2008 New Revision: 8614 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_tag_class.c Log: Tue May 20 09:32:30 EDT 2008 Pekka.Pessi(a)nokia.com * sip_tag_class.c: fixed klocwork issues Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Sun May 25 10:57:14 2008 @@ -1 +1 @@ -Sun May 25 09:56:21 EDT 2008 +Sun May 25 10:57:08 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_tag_class.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_tag_class.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_tag_class.c Sun May 25 10:57:14 2008 @@ -158,7 +158,8 @@ (msg_pub_t *)sip, hc); /* Is header present in the SIP message? */ - if ((char *)hh >= ((char *)sip + sip->sip_size) || + if (hh == NULL || + (char *)hh >= ((char *)sip + sip->sip_size) || (char *)hh < (char *)&sip->sip_request) return dst; @@ -234,8 +235,12 @@ if (h == SIP_NONE) { /* Remove header */ hh = msg_hclass_offset(msg_mclass(msg), (msg_pub_t *)sip, hc); - while (*hh) - msg_header_remove(msg, (msg_pub_t *)sip, *hh); + if (hh != NULL && + (char *)hh < ((char *)sip + sip->sip_size) && + (char *)hh >= (char *)&sip->sip_request) { + while (*hh) + msg_header_remove(msg, (msg_pub_t *)sip, *hh); + } continue; } @@ -441,18 +446,21 @@ msg_hclass_t *hc = NULL; hnv = su_strlst_item(l, i); - n = strcspn(hnv, "="); + n = hnv ? strcspn(hnv, "=") : 0; if (n == 0) break; if (n == 4 && strncasecmp(hnv, "body", 4) == 0) t = siptag_payload, hc = sip_payload_class; - else for (j = 0; (t = sip_tag_list[j]); j++) { - hc = (msg_hclass_t *)sip_tag_list[j]->tt_magic; - if (n == 1 && strncasecmp(hnv, hc->hc_short, 1) == 0) - break; - else if (n == (size_t)hc->hc_len && strncasecmp(hnv, hc->hc_name, n) == 0) - break; + else { + for (j = 0; (t = sip_tag_list[j]); j++) { + hc = (msg_hclass_t *)sip_tag_list[j]->tt_magic; + if (n == 1 && strncasecmp(hnv, hc->hc_short, 1) == 0) + break; + else if (n == (size_t)hc->hc_len && + strncasecmp(hnv, hc->hc_name, n) == 0) + break; + } } value = (char *)hnv + n;

1 0

[commit] r8613 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/sip
by Freeswitch SVN 25 May '08

25 May '08

Author: mikej Date: Sun May 25 09:56:27 2008 New Revision: 8613 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_mime.c Log: Tue May 20 09:32:10 EDT 2008 Pekka.Pessi(a)nokia.com * sip_mime.c: use msg_content_type functions with sip_content_type Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Sun May 25 09:56:27 2008 @@ -1 +1 @@ -Sun May 25 09:55:22 EDT 2008 +Sun May 25 09:56:21 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_mime.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_mime.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_mime.c Sun May 25 09:56:27 2008 @@ -554,46 +554,18 @@ issize_t sip_content_type_d(su_home_t *home, sip_header_t *h, char *s, isize_t slen) { - sip_content_type_t *c; - - assert(h); - - c = h->sh_content_type; - - /* "Content-type:" type/subtyp *(; parameter))) */ - if (/* Parse protocol */ - sip_version_d(&s, &c->c_type) == -1 || /* compacts token / token */ - (c->c_subtype = strchr(c->c_type, '/')) == NULL || - (*s == ';' && msg_params_d(home, &s, &c->c_params) == -1) || - (*s != '\0')) - return -1; - - c->c_subtype++; - - return 0; + return msg_content_type_d(home, (msg_header_t *)h, s, slen); } issize_t sip_content_type_e(char b[], isize_t bsiz, sip_header_t const *h, int flags) { - char *b0 = b, *end = b + bsiz; - sip_content_type_t const *c = h->sh_content_type; - - MSG_STRING_E(b, end, c->c_type); - MSG_PARAMS_E(b, end, c->c_params, flags); - MSG_TERM_E(b, end); - - return b - b0; + return msg_content_type_e(b, bsiz, (msg_header_t const *)h, flags); } static isize_t sip_content_type_dup_xtra(sip_header_t const *h, isize_t offset) { - sip_content_type_t const *c = h->sh_content_type; - - MSG_PARAMS_SIZE(offset, c->c_params); - offset += MSG_STRING_SIZE(c->c_type); - - return offset; + return msg_content_type_dup_xtra((msg_header_t *)h, offset); } /** Duplicate one #sip_content_type_t object */ @@ -601,18 +573,9 @@ char *sip_content_type_dup_one(sip_header_t *dst, sip_header_t const *src, char *b, isize_t xtra) { - sip_content_type_t *c = dst->sh_content_type; - sip_content_type_t const *o = src->sh_content_type; - char *end = b + xtra; - - b = msg_params_dup(&c->c_params, o->c_params, b, xtra); - MSG_STRING_DUP(b, c->c_type, o->c_type); - c->c_subtype = strchr(c->c_type, '/'); - c->c_subtype++; - - assert(b <= end); (void)end; - - return b; + return msg_content_type_dup_one((msg_header_t *)dst, + (msg_header_t const *)src, + b, xtra); } /* ====================================================================== */

1 0

[commit] r8612 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/msg
by Freeswitch SVN 25 May '08

25 May '08

Author: mikej Date: Sun May 25 09:55:30 2008 New Revision: 8612 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_basic.c Log: Tue May 20 09:30:24 EDT 2008 Pekka.Pessi(a)nokia.com * msg_basic.c: fixed klocwork issues Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Sun May 25 09:55:30 2008 @@ -1 +1 @@ -Sun May 25 09:54:31 EDT 2008 +Sun May 25 09:55:22 EDT 2008 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 Sun May 25 09:55:30 2008 @@ -212,10 +212,11 @@ msg_payload_t *msg_payload_create(su_home_t *home, void const *data, usize_t len) { msg_header_t *h = msg_header_alloc(home, msg_payload_class, len + 1); - msg_payload_t *pl = h->sh_payload; - if (pl) { + if (h) { + msg_payload_t *pl = (msg_payload_t *)h; char *b = msg_header_data(h->sh_common); + if (data) memcpy(b, data, len); else @@ -227,6 +228,7 @@ return pl; } + return NULL; }

1 0