- Freeswitch-svn - FreeSWITCH Mailing Lists

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

25 May '08

Author: mikej Date: Sun May 25 11:18:36 2008 New Revision: 8631 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c Log: Thu May 22 06:48:11 EDT 2008 Pekka.Pessi(a)nokia.com * outbound.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:18:36 2008 @@ -1 +1 @@ -Sun May 25 11:17:39 EDT 2008 +Sun May 25 11:18:13 EDT 2008 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 Sun May 25 11:18:36 2008 @@ -723,6 +723,9 @@ unsigned d = ob->ob_keepalive.interval; + if (msg == NULL) + return -1; + assert(regsip); assert(regsip->sip_request); if (m && m->m_params) { @@ -842,6 +845,13 @@ if (status < 200) return 0; + if (sip == NULL) { + SU_DEBUG_3(("outbound(%p): keepalive %u %s\n", (void *)ob->ob_owner, + status, phrase)); + ob->ob_oo->oo_keepalive_error(ob->ob_owner, ob, status, phrase, TAG_END()); + return 0; + } + if (status == 401 || status == 407) { if (sip->sip_www_authenticate) challenged += auc_challenge(ob->ob_keepalive.auc,

1 0

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

25 May '08

Author: mikej Date: Sun May 25 11:17:55 2008 New Revision: 8630 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c Log: Thu May 22 06:47:07 EDT 2008 Pekka.Pessi(a)nokia.com * nua_stack.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:17:55 2008 @@ -1 +1 @@ -Sun May 25 11:17:06 EDT 2008 +Sun May 25 11:17:39 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c Sun May 25 11:17:55 2008 @@ -543,8 +543,6 @@ nua_event_t event; int error = 0; - assert(tags); - if (nh) { if (!nh->nh_prev) nh_append(nua, nh); @@ -1043,7 +1041,7 @@ SIPTAG_FROM(from), /* Remote AoR */ TAG_END()); - if (nua_stack_init_handle(nh->nh_nua, nh, NULL) < 0) + if (nh && nua_stack_init_handle(nua, nh, NULL) < 0) nh_destroy(nua, nh), nh = NULL; if (nh && create_dialog) { @@ -1860,8 +1858,6 @@ int terminated; int handle_can_be_terminated = initial && !sr->sr_event; - assert(nh); - if (sr->sr_application) { /* There was an error sending response */ if (sr->sr_application != sr->sr_status) @@ -2811,10 +2807,12 @@ char const *phrase, sip_t const *sip) { - nua_handle_t *nh = cr->cr_owner; + nua_handle_t *nh; assert(cr && status >= 200 && phrase && sip); + nh = cr->cr_owner; + if (cr->cr_retry_count > NH_PGET(nh, retry_count)) return 0;

1 0

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

25 May '08

Author: mikej Date: Sun May 25 11:17:18 2008 New Revision: 8629 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c Log: Thu May 22 06:46:18 EDT 2008 Pekka.Pessi(a)nokia.com * nta.c: fixed klocwork issue in nta_outgoing_prack() Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Sun May 25 11:17:18 2008 @@ -1 +1 @@ -Sun May 25 11:14:58 EDT 2008 +Sun May 25 11:17:06 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c Sun May 25 11:17:18 2008 @@ -10668,9 +10668,9 @@ } if (rack) { - rack->ra_cseq = orq->orq_cseq->cs_seq; - rack->ra_method = orq->orq_cseq->cs_method; - rack->ra_method_name = orq->orq_cseq->cs_method_name; + rack->ra_cseq = oorq->orq_cseq->cs_seq; + rack->ra_method = oorq->orq_cseq->cs_method; + rack->ra_method_name = oorq->orq_cseq->cs_method_name; } }

1 0

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

25 May '08

Author: mikej Date: Sun May 25 11:15:04 2008 New Revision: 8628 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_logging.c Log: Tue May 20 13:46:57 EDT 2008 Pekka.Pessi(a)nokia.com * tport_logging.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:15:04 2008 @@ -1 +1 @@ -Sun May 25 11:13:45 EDT 2008 +Sun May 25 11:14:58 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_logging.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_logging.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_logging.c Sun May 25 11:15:04 2008 @@ -152,13 +152,17 @@ char label[24] = ""; char *comp = ""; char name[SU_ADDRSIZE] = ""; - su_sockaddr_t const *su = msg_addr(msg); + su_sockaddr_t const *su; unsigned short second, minute, hour; + assert(self); assert(msg); + second = (unsigned short)(now.tv_sec % 60); minute = (unsigned short)((now.tv_sec / 60) % 60); hour = (unsigned short)((now.tv_sec / 3600) % 24); + su = msg_addr(msg); + #if SU_HAVE_IN6 if (su->su_family == AF_INET6) { if (su->su_sin6.sin6_flowinfo) @@ -183,10 +187,13 @@ size_t n, su_iovec_t const iov[], size_t iovused, char const *what, char const *how) { - tport_master_t *mr = self->tp_master; + tport_master_t *mr; char stamp[128]; size_t i; + assert(self); assert(msg); + + mr = self->tp_master; if (!mr->mr_dump_file) return;

1 0

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

25 May '08

Author: mikej Date: Sun May 25 11:14:40 2008 New Revision: 8627 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c Log: Tue May 20 13:46:46 EDT 2008 Pekka.Pessi(a)nokia.com * tport.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:14:40 2008 @@ -1 +1 @@ -Sun May 25 11:12:25 EDT 2008 +Sun May 25 11:13:45 EDT 2008 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 Sun May 25 11:14:40 2008 @@ -1178,7 +1178,6 @@ ta_list ta; int n; tport_params_t const *tpp; - tport_primary_t const *pri = self->tp_pri; int connect; if (self == NULL) @@ -1207,7 +1206,9 @@ TPTAG_THRPRQSIZE(tpp->tpp_thrprqsize), TPTAG_SIGCOMP_LIFETIME(tpp->tpp_sigcomp_lifetime), TPTAG_STUN_SERVER(tpp->tpp_stun_server), - TAG_IF(pri, TPTAG_PUBLIC(pri ? pri->pri_public : 0)), + TAG_IF(self->tp_pri, + TPTAG_PUBLIC(self->tp_pri ? + self->tp_pri->pri_public : 0)), TPTAG_TOS(tpp->tpp_tos), TAG_END()); @@ -2956,7 +2957,7 @@ #if SU_HAVE_IN6 if (su->su_family == AF_INET6) { ipaddr[0] = '['; - su_inet_ntop(su->su_family, SU_ADDR(su), ipaddr + 1, sizeof(ipaddr) - 1); + su_inet_ntop(su->su_family, SU_ADDR(su), ipaddr + 1, SU_ADDRSIZE); strcat(ipaddr, "]"); } else { @@ -4680,7 +4681,9 @@ n_canon = 0; s = su_alloc(home, n_proto + n_canon + n_host + n_port + n_comp); - + if (s == NULL) + return -1; + if (n_proto) dst->tpn_proto = memcpy(s, src->tpn_proto, n_proto), s += n_proto; else

1 0

[commit] r8626 - 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:13:28 2008 New Revision: 8626 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_md5.c Log: Tue May 20 13:33:05 EDT 2008 Pekka.Pessi(a)nokia.com * su_md5.c: fixed typo in comment Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_md5.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_md5.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_md5.c Sun May 25 11:13:28 2008 @@ -332,7 +332,7 @@ p = ctx->in + count; *p++ = 0x80; - /* Bytes of padding needde to make 64 bytes */ + /* Bytes of padding needed to make 64 bytes */ count = 64 - 1 - count; /* Pad out to 56 mod 64 */

1 0

[commit] r8625 - 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:13:10 2008 New Revision: 8625 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_wait.c Log: Tue May 20 13:32:51 EDT 2008 Pekka.Pessi(a)nokia.com * su_wait.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:13:10 2008 @@ -1 +1 @@ -Sun May 25 11:11:31 EDT 2008 +Sun May 25 11:12:25 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_wait.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_wait.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_wait.c Sun May 25 11:13:10 2008 @@ -186,16 +186,14 @@ { #if SU_HAVE_WINSOCK su_wait_t w0 = NULL; + assert(waitobj != NULL); if (*waitobj) WSACloseEvent(*waitobj); -#elif SU_HAVE_POLL || HAVE_SELECT - su_wait_t w0 = { INVALID_SOCKET, 0, 0 }; #else su_wait_t w0 = { INVALID_SOCKET, 0, 0 }; -#endif assert(waitobj != NULL); *waitobj = w0; - +#endif return waitobj ? 0 : -1; }

1 0

[commit] r8624 - 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:12:06 2008 New Revision: 8624 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_vector.c Log: Tue May 20 13:32:37 EDT 2008 Pekka.Pessi(a)nokia.com * su_vector.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:12:06 2008 @@ -1 +1 @@ -Sun May 25 11:11:12 EDT 2008 +Sun May 25 11:11:31 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_vector.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_vector.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_vector.c Sun May 25 11:12:06 2008 @@ -236,13 +236,18 @@ */ int su_vector_append(su_vector_t *vector, void *item) { - size_t index = vector->v_len; + size_t index; - if (vector && su_vector_make_place(vector, index)) { - vector->v_list[index] = item; - return 0; - } - return -1; + if (vector == 0) + return -1; + + index = vector->v_len; + + if (su_vector_make_place(vector, index) <= 0) + return -1; + + vector->v_list[index] = item; + return 0; } /**Get a numbered item from list.

1 0

[commit] r8623 - 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:11:19 2008 New Revision: 8623 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_taglist.c Log: Tue May 20 13:32:28 EDT 2008 Pekka.Pessi(a)nokia.com * su_taglist.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:11:19 2008 @@ -1 +1 @@ -Sun May 25 11:10:29 EDT 2008 +Sun May 25 11:11:12 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_taglist.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_taglist.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_taglist.c Sun May 25 11:11:19 2008 @@ -155,7 +155,7 @@ if (m < 0) return m; - if (m == 0 && (size_t)n < size) + if (m == 0 && 0 < n && (size_t)n < size) b[--n] = '\0'; return n + m; @@ -756,6 +756,8 @@ va_end(aq); t = rv = malloc(size); + if (rv == NULL) + return rv; tagi[0].t_tag = tag; tagi[0].t_value = value;

1 0

[commit] r8622 - 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:34 2008 New Revision: 8622 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_base_port.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_port.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_pthread_port.c Log: Tue May 20 13:30:50 EDT 2008 Pekka.Pessi(a)nokia.com * su_port.c, su_base_port.c, su_pthread_port.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:34 2008 @@ -1 +1 @@ -Sun May 25 11:09:54 EDT 2008 +Sun May 25 11:10:29 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_base_port.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_base_port.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_base_port.c Sun May 25 11:10:34 2008 @@ -560,11 +560,18 @@ su_root_destroy(task->sut_root); } +/**Wait for the clone to exit. + * @internal + * + * Called by su_port_wait() and su_clone_wait() + */ void su_base_port_wait(su_clone_r rclone) { su_port_t *self; su_root_t *root_to_wait; + assert(*rclone); + self = su_msg_from(rclone)->sut_port; assert(self == su_msg_to(rclone)->sut_port); root_to_wait = su_msg_to(rclone)->sut_root; Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_port.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_port.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_port.c Sun May 25 11:10:34 2008 @@ -427,10 +427,18 @@ #endif } +/** Wait for clone to exit. + * + * @internal + * + * Called by su_clone_wait(). + */ void su_port_wait(su_clone_r rclone) { su_port_t *cloneport; + assert(*rclone); + cloneport = su_msg_to(rclone)->sut_port; cloneport->sup_vtable->su_port_wait(rclone); } Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_pthread_port.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_pthread_port.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_pthread_port.c Sun May 25 11:10:34 2008 @@ -388,6 +388,8 @@ /** Wait for the pthread clone to exit. * @internal + * + * Called by su_port_wait() and su_clone_wait(). */ void su_pthread_port_wait(su_clone_r rclone) { @@ -395,6 +397,8 @@ struct su_pthread_port_waiting_parent mom[1]; pthread_t tid; + assert(*rclone); + clone = su_msg_to(rclone)->sut_port; parent = su_msg_from(rclone)->sut_port;

1 0