February 2009 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r11786 - freeswitch/trunk/libs/sofia-sip/win32/libsofia-sip-ua-static
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: mikej Date: Wed Feb 11 10:28:33 2009 New Revision: 11786 Log: Thu Jan 8 12:12:46 CST 2009 Pekka Pessi <first.last(a)nokia.com> * sofia-sip/su_string.h, su_string:c: added to win32 Modified: freeswitch/trunk/libs/sofia-sip/win32/libsofia-sip-ua-static/libsofia_sip_ua_static.dsp freeswitch/trunk/libs/sofia-sip/win32/libsofia-sip-ua-static/libsofia_sip_ua_static.vcproj Modified: freeswitch/trunk/libs/sofia-sip/win32/libsofia-sip-ua-static/libsofia_sip_ua_static.dsp ============================================================================== --- freeswitch/trunk/libs/sofia-sip/win32/libsofia-sip-ua-static/libsofia_sip_ua_static.dsp (original) +++ freeswitch/trunk/libs/sofia-sip/win32/libsofia-sip-ua-static/libsofia_sip_ua_static.dsp Wed Feb 11 10:28:33 2009 @@ -341,7 +341,7 @@ # End Source File # Begin Source File -SOURCE="..\..\libsofia-sip-ua\su\strcasestr.c" +SOURCE="..\..\libsofia-sip-ua\su\su_string.c" # End Source File # Begin Source File @@ -865,6 +865,10 @@ # End Source File # Begin Source File +SOURCE="..\..\libsofia-sip-ua\su\sofia-sip\su_string.h" +# End Source File +# Begin Source File + SOURCE="..\..\libsofia-sip-ua\su\sofia-sip\su.h" # End Source File # Begin Source File Modified: freeswitch/trunk/libs/sofia-sip/win32/libsofia-sip-ua-static/libsofia_sip_ua_static.vcproj ============================================================================== --- freeswitch/trunk/libs/sofia-sip/win32/libsofia-sip-ua-static/libsofia_sip_ua_static.vcproj (original) +++ freeswitch/trunk/libs/sofia-sip/win32/libsofia-sip-ua-static/libsofia_sip_ua_static.vcproj Wed Feb 11 10:28:33 2009 @@ -1395,7 +1395,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\libsofia-sip-ua\su\strcasestr.c" + RelativePath="..\..\libsofia-sip-ua\su\su_string.c" > <FileConfiguration Name="Debug|Win32" @@ -3829,6 +3829,10 @@ > </File> <File + RelativePath="..\..\libsofia-sip-ua\su\sofia-sip\su_string.h" + > + </File> + <File RelativePath="..\..\libsofia-sip-ua\su\sofia-sip\su.h" > </File>

1 0

[commit] r11785 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/su
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: mikej Date: Wed Feb 11 10:27:51 2009 New Revision: 11785 Log: Thu Jan 8 12:08:14 CST 2009 Pekka Pessi <first.last(a)nokia.com> * memspn.c, memcspn.c: use functions from <sofia-sip/su_string.h> Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/memcspn.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/memspn.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Wed Feb 11 10:27:51 2009 @@ -1 +1 @@ -Wed Feb 11 10:23:36 CST 2009 +Wed Feb 11 10:27:42 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/memcspn.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/memcspn.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/memcspn.c Wed Feb 11 10:27:51 2009 @@ -32,50 +32,13 @@ #include "config.h" -#include <string.h> -#include <limits.h> +#include <sofia-sip/su_string.h> + +size_t memcspn(const void *mem, size_t memlen, + const void *reject, size_t rejectlen); -/**Search memory for bytes not in a given set. - * - * The memcspn() function calculates the length of the memory area @a mem - * which consists entirely of bytes not in @a reject. - * - * @param mem pointer to memory area - *�@param memlen size of @a mem in bytes - * @param reject pointer to table containing bytes to reject - * @param rejectlen size of @a reject table - * - * @return - * The memspn() function returns the number of bytes in the memory area @a - * which consists entirely of bytes not in @a reject. - * @par - * If @a rejectlen is 0, or @a reject is NULL, it returns @a memlen, size of - * the memory area. - */ size_t memcspn(const void *mem, size_t memlen, const void *reject, size_t rejectlen) { - size_t i; - - unsigned char const *m = mem, *r = reject; - - char rejected[UCHAR_MAX + 1]; - - if (rejectlen == 0 || reject == 0) - return memlen; - - if (mem == NULL || memlen == 0) - return 0; - - memset(rejected, 0, sizeof rejected); - - for (i = 0; i < rejectlen; i++) - rejected[r[i]] = 1; - - for (i = 0; i < memlen; i++) - if (rejected[m[i]]) - break; - - return i; + return su_memcspn(mem, memlen, reject, rejectlen); } - Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/memspn.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/memspn.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/memspn.c Wed Feb 11 10:27:51 2009 @@ -34,43 +34,13 @@ #include "config.h" -#include <string.h> -#include <limits.h> +#include <sofia-sip/su_string.h> + +size_t memspn(const void *mem, size_t memlen, + const void *accept, size_t acceptlen); -/**Scan memory for a set of bytes. - * - * The memspn() function calculates the length of the memory area @a mem - * which consists entirely of bytes in @a accept. - * - * @param mem pointer to memory area - * @param memlen size of @a mem in bytes - * @param accept pointer to table containing bytes to accept - * @param acceptlen size of @a accept table - * - * @return - * The memspn() function returns the number of bbytes in the memory area @a - * which consists entirely of bytes in @a accept. - */ size_t memspn(const void *mem, size_t memlen, const void *accept, size_t acceptlen) { - size_t i; - - unsigned char const *m = mem, *a = accept; - - char accepted[UCHAR_MAX + 1]; - - if (mem == NULL || memlen == 0 || acceptlen == 0 || accept == NULL) - return 0; - - memset(accepted, 0, sizeof accepted); - - for (i = 0; i < acceptlen; i++) - accepted[a[i]] = 1; - - for (i = 0; i < memlen; i++) - if (!accepted[m[i]]) - break; - - return i; + return su_memspn(mem, memlen, accept, acceptlen); }

1 0

[commit] r11784 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/su/sofia-sip
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: mikej Date: Wed Feb 11 10:23:44 2009 New Revision: 11784 Log: Thu Jan 8 11:55:52 CST 2009 Pekka Pessi <first.last(a)nokia.com> * sofia-sip/string0.h: use functions from <sofia-sip/su_string.h> Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/string0.h Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Wed Feb 11 10:23:44 2009 @@ -1 +1 @@ -Wed Feb 11 10:23:03 CST 2009 +Wed Feb 11 10:23:36 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/string0.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/string0.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/string0.h Wed Feb 11 10:23:44 2009 @@ -1,145 +1,47 @@ -/* - * This file is part of the Sofia-SIP package - * - * Copyright (C) 2005 Nokia Corporation. - * - * Contact: Pekka Pessi <pekka.pessi(a)nokia.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA - * - */ - #ifndef STRING0_H /** Defined when <sofia-sip/string0.h> is included. */ #define STRING0_H /**@file sofia-sip/string0.h * - * @brief Extra string function. + * @brief Extra string functions. * * String comparison functions accepting NULL pointers: str0cmp(), * str0ncmp(), str0casecmp(), str0ncasecmp(). Also includes span functions * testing at most @a n bytes: strncspn(), strnspn(). + * + * @deprecated Use functions from <sofia-sip/su_string.h> instead. */ -#ifndef SU_CONFIG_H -#include <sofia-sip/su_config.h> -#endif - -#include <string.h> - -SOFIA_BEGIN_DECLS +#include <sofia-sip/su_string.h> su_inline int str0cmp(char const *a, char const *b) { - if (a == NULL) a = ""; - if (b == NULL) b = ""; - return strcmp(a, b); + return su_strcmp(a, b); } su_inline int str0ncmp(char const *a, char const *b, size_t n) { - if (a == NULL) a = ""; - if (b == NULL) b = ""; - return strncmp(a, b, n); + return su_strncmp(a, b, n); } su_inline int str0casecmp(char const *a, char const *b) { - if (a == NULL) a = ""; - if (b == NULL) b = ""; - return strcasecmp(a, b); + return su_strcasecmp(a, b); } su_inline int str0ncasecmp(char const *a, char const *b, size_t n) { - if (a == NULL) a = ""; - if (b == NULL) b = ""; - return strncasecmp(a, b, n); + return su_strncasecmp(a, b, n); } -#if !SU_HAVE_INLINE -SOFIAPUBFUN size_t strnspn(char const *s, size_t size, char const *term); -SOFIAPUBFUN size_t strncspn(char const *s, size_t ssize, char const *reject); -#else su_inline size_t strnspn(char const *s, size_t ssize, char const *term) { - size_t n; - size_t tsize = strlen(term); - - if (tsize == 0) { - return 0; - } - else if (tsize == 1) { - char c, t = term[0]; - for (n = 0; n < ssize && (c = s[n]) && c == t; n++) - ; - } - else if (tsize == 2) { - char c, t1 = term[0], t2 = term[1]; - for (n = 0; n < ssize && (c = s[n]) && (c == t1 || c == t2); n++) - ; - } - else { - size_t i; - char c, t1 = term[0], t2 = term[1]; - for (n = 0; n < ssize && (c = s[n]) && (c == t1 || c == t2); n++) { - for (i = 2; i < tsize; i++) - if (c == term[i]) - return n; - } - } - - return n; -} - -su_inline size_t strncspn(char const *s, size_t ssize, char const *reject) -{ - size_t n; - size_t rsize = strlen(reject); - - if (rsize == 0) { - for (n = 0; n < ssize && s[n]; n++) - ; - } - else if (rsize == 1) { - char c, rej = reject[0]; - for (n = 0; n < ssize && (c = s[n]) && c != rej; n++) - ; - } - else if (rsize == 2) { - char c, rej1 = reject[0], rej2 = reject[1]; - for (n = 0; n < ssize && (c = s[n]) && c != rej1 && c != rej2; n++) - ; - } - else { - size_t i; - char c, rej1 = reject[0], rej2 = reject[1]; - for (n = 0; n < ssize && (c = s[n]) && c != rej1 && c != rej2; n++) { - for (i = 2; i < rsize; i++) - if (c == reject[i]) - return n; - } - } - - return n; + return su_strnspn(s, ssize, term); } +su_inline size_t strncspn(char const *s, size_t ssize, char const *term) +{ + return su_strncspn(s, ssize, term); +} #endif - -SOFIA_END_DECLS - -#endif /* !STRING0_H */

1 0

[commit] r11783 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: mikej Date: Wed Feb 11 10:23:10 2009 New Revision: 11783 Log: Fri Jan 9 10:33:14 CST 2009 Pekka Pessi <first.last(a)nokia.com> * nua_session.c: when negotiating session refresher, default to UAC Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Wed Feb 11 10:23:10 2009 @@ -1 +1 @@ -Wed Feb 11 10:19:39 CST 2009 +Wed Feb 11 10:23:03 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Wed Feb 11 10:23:10 2009 @@ -371,9 +371,9 @@ int initial, msg_t *msg, sip_t *sip); -static void session_timer_negotiate(struct session_timer *t); +static void session_timer_negotiate(struct session_timer *t, int uas); -static void session_timer_set(nua_session_usage_t *ss); +static void session_timer_set(nua_session_usage_t *ss, int uas); static int session_timer_check_restart(nua_client_request_t *cr, int status, char const *phrase, @@ -849,6 +849,7 @@ { nua_dialog_usage_t *du = cr->cr_usage; nua_session_usage_t *ss = nua_dialog_usage_private(du); + int uas; if (ss == NULL || sip == NULL) { /* Xyzzy */ @@ -859,7 +860,7 @@ if (session_timer_is_supported(ss->ss_timer)) session_timer_store(ss->ss_timer, sip); - session_timer_set(ss); + session_timer_set(ss, uas = 0); } return nua_session_client_response(cr, status, phrase, sip); @@ -2505,6 +2506,7 @@ nua_session_usage_t *ss = nua_dialog_usage_private(sr->sr_usage); msg_t *msg = nta_incoming_getrequest_ackcancel(irq); char const *recv = NULL; + int uas; if (ss == NULL) return 0; @@ -2568,7 +2570,7 @@ nua_stack_event(nh->nh_nua, nh, msg, nua_i_ack, SIP_200_OK, NULL); signal_call_state_change(nh, ss, 200, "OK", nua_callstate_ready); - session_timer_set(ss); + session_timer_set(ss, uas = 1); nua_server_request_destroy(sr); @@ -3331,6 +3333,7 @@ nua_handle_t *nh = cr->cr_owner; nua_dialog_usage_t *du = cr->cr_usage; nua_session_usage_t *ss = nua_dialog_usage_private(du); + int uas; assert(200 <= status); @@ -3345,7 +3348,7 @@ if (!sr && (!du->du_cr || !du->du_cr->cr_orq)) { session_timer_store(ss->ss_timer, sip); - session_timer_set(ss); + session_timer_set(ss, uas = 0); } } } @@ -3553,6 +3556,7 @@ if (ss && session_timer_is_supported(ss->ss_timer)) { nua_server_request_t *sr0; + int uas; session_timer_add_headers(ss->ss_timer, 0, msg, sip); @@ -3561,7 +3565,7 @@ break; if (!sr0 && (!sr->sr_usage->du_cr || !sr->sr_usage->du_cr->cr_orq)) - session_timer_set(ss); + session_timer_set(ss, uas = 1); } } @@ -4354,7 +4358,8 @@ static int session_timer_add_headers(struct session_timer *t, int initial, - msg_t *msg, sip_t *sip) + msg_t *msg, + sip_t *sip) { unsigned long expires, min; sip_min_se_t min_se[1]; @@ -4376,7 +4381,7 @@ min = t->remote.min_se; if (uas) { - session_timer_negotiate(t); + session_timer_negotiate(t, uas = 1); refresher = t->refresher; expires = t->interval; @@ -4417,8 +4422,8 @@ return 1; } -static -void session_timer_negotiate(struct session_timer *t) +static void +session_timer_negotiate(struct session_timer *t, int uas) { if (!t->local.supported) t->refresher = nua_no_refresher; @@ -4428,8 +4433,11 @@ t->refresher = nua_local_refresher; else if (t->remote.refresher == nua_remote_refresher) t->refresher = nua_remote_refresher; + else if (uas) + /* UAS defaults UAC to refreshing */ + t->refresher = nua_remote_refresher; else - /* Default to initiate refreshes */ + /* UAC refreshes by itself */ t->refresher = nua_local_refresher; t->interval = t->remote.expires; @@ -4452,7 +4460,7 @@ } static void -session_timer_set(nua_session_usage_t *ss) +session_timer_set(nua_session_usage_t *ss, int uas) { nua_dialog_usage_t *du = nua_dialog_usage_public(ss); struct session_timer *t; @@ -4462,7 +4470,7 @@ t = ss->ss_timer; - session_timer_negotiate(t); + session_timer_negotiate(t, uas); if (t->refresher == nua_local_refresher) { unsigned low = t->interval / 2, high = t->interval / 2;

1 0

[commit] r11782 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: mikej Date: Wed Feb 11 10:21:43 2009 New Revision: 11782 Log: Fri Jan 9 10:19:27 CST 2009 Pekka Pessi <first.last(a)nokia.com> * auth_client.c: updated documentation Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_client.c 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 Wed Feb 11 10:21:43 2009 @@ -92,7 +92,7 @@ * @param[in] ch challenge to be processed * @param[in] crcl credential class * - * @retval 1 when challenge was updated + * @retval 1 when at least one challenge was updated * @retval 0 when there was no new challenges * @retval -1 upon an error */ @@ -291,9 +291,10 @@ * * @param[in,out] auc_list list of authenticators * @param[in,out] home memory home used for allocations - * @param[in] data colon-separated authentication data + * @param[in] data colon-separated authentication data * - * @retval 0 when successful + * @retval >0 when successful + * @retval 0 if not authenticator matched with @a data * @retval -1 upon an error */ int auc_credentials(auth_client_t **auc_list, su_home_t *home, @@ -340,15 +341,13 @@ * * scheme:"realm":user:pass * - * @todo The authentication data format sucks. - * * @param[in,out] auc_list list of authenticators * @param[in] scheme scheme to use (NULL, if any) * @param[in] realm realm to use (NULL, if any) * @param[in] user username * @param[in] pass password * - * @retval number of updated clients + * @retval >0 or number of updated clients when successful * @retval 0 when no client was updated * @retval -1 upon an error */ @@ -528,7 +527,7 @@ return 1; } -/** Check if we have all required credentials. +/** Check if there are credentials for all challenges. * * @retval 1 when authorization can proceed * @retval 0 when there is not enough credentials @@ -587,7 +586,7 @@ if (pub == NULL) pub = msg_object(msg); - /* Remove existing credentials */ + /* Remove existing credential headers */ for (ca = *auc_list; ca; ca = ca->ca_next) { msg_header_t **hh = msg_hclass_offset(mc, pub, ca->ca_credential_class); @@ -595,7 +594,7 @@ msg_header_remove(msg, pub, *hh); } - /* Insert new credentials */ + /* Insert new credential headers */ for (; *auc_list; auc_list = &(*auc_list)->ca_next) { su_home_t *home = msg_home(msg); msg_header_t *h = NULL;

1 0

[commit] r11781 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: mikej Date: Wed Feb 11 10:19:47 2009 New Revision: 11781 Log: Thu Jan 8 14:20:45 CST 2009 Pekka Pessi <first.last(a)nokia.com> * outbound.c: use default peer info when outbound is created 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 Wed Feb 11 10:19:47 2009 @@ -1 +1 @@ -Wed Feb 11 10:18:18 CST 2009 +Wed Feb 11 10:19:39 CST 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 Wed Feb 11 10:19:47 2009 @@ -216,6 +216,8 @@ su_sprintf(ob->ob_home, "+sip.instance=\"<%s>\"", instance); ob->ob_reg_id = 0; + outbound_peer_info(ob, NULL); + /* Generate a random cookie (used as Call-ID) for us */ su_md5_init(md5); su_guid_generate(guid);

1 0

[commit] r11780 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: mikej Date: Wed Feb 11 10:19:02 2009 New Revision: 11780 Log: Thu Jan 8 13:04:57 CST 2009 Pekka Pessi <first.last(a)nokia.com> * docs/Doxyfile.aliases: Added @VERSION_1_12_10, @NEW_1_12_10 Also @VERSION_UNRELEASED and @NEW_UNRELEASED. Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/Doxyfile.aliases Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/Doxyfile.aliases ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/Doxyfile.aliases (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/Doxyfile.aliases Wed Feb 11 10:19:02 2009 @@ -56,5 +56,9 @@ "NEW_1_12_8=@since New in <a href=\"http://sofia-sip.sf.net/relnotes/relnotes-sofia-sip-1.12.8.txt\">1.12.8</a>" \ "VERSION_1_12_9=<a href=\"http://sofia-sip.sf.net/relnotes/relnotes-sofia-sip-1.12.9.txt\">1.12.9</a>" \ "NEW_1_12_9=@since New in <a href=\"http://sofia-sip.sf.net/relnotes/relnotes-sofia-sip-1.12.9.txt\">1.12.9</a>" \ + "VERSION_1_12_10=<a href=\"http://sofia-sip.sf.net/relnotes/relnotes-sofia-sip-1.12.10.txt\">1.12.10</a>" \ + "NEW_1_12_10=@since New in <a href=\"http://sofia-sip.sf.net/relnotes/relnotes-sofia-sip-1.12.10.txt\">1.12.10</a>" \ + "VERSION_UNRELEASED=UNRELEASED" \ + "NEW_UNRELEASED=@since Not yet released" \

1 0

[commit] r11779 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/iptsec libsofia-sip-ua/iptsec/sofia-sip
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: mikej Date: Wed Feb 11 10:18:36 2009 New Revision: 11779 Log: Thu Jan 8 13:04:03 CST 2009 Pekka Pessi <first.last(a)nokia.com> * auth_client: do not crash with unknown authentication schemes Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/auth_client.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/sofia-sip/auth_client_plugin.h Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Wed Feb 11 10:18:36 2009 @@ -1 +1 @@ -Wed Feb 11 10:16:40 CST 2009 +Wed Feb 11 10:18:18 CST 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 Wed Feb 11 10:18:36 2009 @@ -128,11 +128,17 @@ if (!matched) { /* There was no matching authenticator, create a new one */ *cca = ca_create(home, scheme, realm); - if (ca_challenge((*cca), ch, crcl, scheme, realm) < 0) { + + if (*cca == NULL) { + return -1; + } + else if (ca_challenge((*cca), ch, crcl, scheme, realm) < 0) { ca_destroy(home, *cca), *cca = NULL; return -1; } - retval = 1; /* Updated authenticator */ + /* XXX - case w/ unknown authentication scheme */ + else + retval = 1; /* Updated authenticator */ } } Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/sofia-sip/auth_client_plugin.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/sofia-sip/auth_client_plugin.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/sofia-sip/auth_client_plugin.h Wed Feb 11 10:18:36 2009 @@ -98,7 +98,8 @@ /** Check if authentication client has been extended. @NEW_1_12_6. */ #define AUTH_CLIENT_IS_EXTENDED(ca) \ - ((ca)->ca_auc->auc_plugin_size > \ + ((ca)->ca_auc && \ + (ca)->ca_auc->auc_plugin_size > \ (int)offsetof(auth_client_plugin_t, auc_clear) \ && (ca)->ca_auc->auc_clear != NULL)

1 0

[commit] r11778 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: mikej Date: Wed Feb 11 10:17:58 2009 New Revision: 11778 Log: Thu Jan 8 14:11:49 CST 2009 Pekka Pessi <first.last(a)nokia.com> * su_string.c: fixed su_strcasestr() Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/test_memmem.c Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/test_memmem.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/test_memmem.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/test_memmem.c Wed Feb 11 10:17:58 2009 @@ -147,6 +147,9 @@ TEST_1(su_strcasestr("OnG", hs) == NULL); TEST_1(su_strcasestr(hs, "Z") == NULL); TEST_1(su_strcasestr(hs, "z") == NULL); + + TEST_S(su_strcasestr("foobar", "OB"), "obar"); + TEST_S(su_strcasestr("FOOBAR", "ob"), "OBAR"); } {

1 0

[commit] r11777 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/su
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: mikej Date: Wed Feb 11 10:16:52 2009 New Revision: 11777 Log: Thu Jan 8 12:04:21 CST 2009 Pekka Pessi <first.last(a)nokia.com> * sofia-sip/su_string.h: added Adding locale-independent, NULL-safe string comparison, matching and searching functions: - su_strcmp() - su_strncmp() - su_strcasecmp() - su_strncasecmp() - su_strmatch() - su_strnmatch() - su_casematch() - su_casenmatch() - su_strcasestr() - su_strnspn() - su_strncspn() - su_memspn() - su_memcspn() Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/Makefile.am freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/test_memmem.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Wed Feb 11 10:16:52 2009 @@ -1 +1 @@ -Wed Feb 11 10:15:25 CST 2009 +Wed Feb 11 10:16:40 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/Makefile.am Wed Feb 11 10:16:52 2009 @@ -54,7 +54,7 @@ sofia-sip/su_config.h sofia-sip/su_md5.h \ sofia-sip/su_uniqueid.h sofia-sip/su_bm.h \ sofia-sip/tstdef.h sofia-sip/su_os_nw.h \ - sofia-sip/string0.h \ + sofia-sip/su_string.h sofia-sip/string0.h \ $(OSXHEADERS) nobase_nodist_include_sofia_HEADERS = sofia-sip/su_configure.h @@ -73,11 +73,12 @@ su_os_nw.c \ su_taglist.c su_tag.c su_tag_io.c \ su_log.c su_global_log.c su_default_log.c su_module_debug.h \ - su_md5.c su_uniqueid.c su_bm.c smoothsort.c string0.c $(OSXSOURCES) + su_md5.c su_uniqueid.c su_bm.c smoothsort.c su_string.c string0.c \ + $(OSXSOURCES) EXTRA_libsu_la_SOURCES = \ - memmem.c strtoull.c strcasestr.c \ + memmem.c strtoull.c \ memspn.c memcspn.c memccpy.c \ inet_ntop.c inet_pton.c poll.c getopt.c \ su_tag_ref.c Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/test_memmem.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/test_memmem.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/test_memmem.c Wed Feb 11 10:16:52 2009 @@ -22,11 +22,11 @@ * */ -/**@ingroup test_memmem +/**@ingroup test_su_string * * @CFILE test_memmem.c * - * Torture tests for memmem() and strcasestr(). + * Torture tests for various string utility functions. * * @author Pekka Pessi <Pekka.Pessi(a)nokia.com> * @@ -35,6 +35,8 @@ #include "config.h" +#include <sofia-sip/su_string.h> + #include <stddef.h> #include <stdlib.h> #include <limits.h> @@ -45,9 +47,6 @@ void *memmem(const void *haystack, size_t haystacklen, const void *needle, size_t needlelen); #endif -#if !HAVE_STRCASESTR -char *strcasestr(const char *haystack, const char *needle); -#endif #include <string.h> @@ -116,38 +115,38 @@ "A case-folding string searching test consisting of a Long String"; char const *s; - s = strcasestr(hs, "sting"); + s = su_strcasestr(hs, "sting"); TEST_S(s, hs + 42); - s = strcasestr(hs, "String"); + s = su_strcasestr(hs, "String"); TEST_S(s, hs + 15); - s = strcasestr(hs, "S"); + s = su_strcasestr(hs, "S"); TEST_S(s, hs + 4); - s = strcasestr(hs, "L"); + s = su_strcasestr(hs, "L"); TEST_S(s, hs + 9); - s = strcasestr(hs, "trings"); + s = su_strcasestr(hs, "trings"); TEST_1(s == NULL); - s = strcasestr(hs, "String"); + s = su_strcasestr(hs, "String"); TEST_S(s, hs + 15); - s = strcasestr(hs, "StRiNg"); + s = su_strcasestr(hs, "StRiNg"); TEST_S(s, hs + 15); - s = strcasestr(hs, "OnG"); + s = su_strcasestr(hs, "OnG"); TEST_S(s, hs + 54); /* Special cases */ - TEST_1(strcasestr(hs, "") == hs); - TEST_1(strcasestr("", "ong") == NULL); - TEST_1(strcasestr("", "OnG") == NULL); - TEST_1(strcasestr("ong", hs) == NULL); - TEST_1(strcasestr("OnG", hs) == NULL); - TEST_1(strcasestr(hs, "Z") == NULL); - TEST_1(strcasestr(hs, "z") == NULL); + TEST_1(su_strcasestr(hs, "") == hs); + TEST_1(su_strcasestr("", "ong") == NULL); + TEST_1(su_strcasestr("", "OnG") == NULL); + TEST_1(su_strcasestr("ong", hs) == NULL); + TEST_1(su_strcasestr("OnG", hs) == NULL); + TEST_1(su_strcasestr(hs, "Z") == NULL); + TEST_1(su_strcasestr(hs, "z") == NULL); } { @@ -219,16 +218,114 @@ char const *s; - s = strcasestr(hs, needle); + s = su_strcasestr(hs, needle); TEST_S(s, hs + 1920); - s = strcasestr(hs, Needle); + s = su_strcasestr(hs, Needle); TEST_S(s, hs + 1920); } END(); } +static int test_casematch(void) +{ + BEGIN(); + + TEST_1(!su_casematch(NULL, "")); + TEST_1(su_casematch(NULL, NULL)); + TEST_1(!su_casematch("", NULL)); + + TEST_1(!su_casenmatch(NULL, "", 1)); + TEST_1(su_casenmatch(NULL, NULL, 1)); + TEST_1(!su_casenmatch("", NULL, 1)); + + TEST_1(su_casenmatch(NULL, "", 0)); + TEST_1(su_casenmatch(NULL, NULL, 0)); + TEST_1(su_casenmatch("", NULL, 0)); + + TEST_1(su_casenmatch("foo", "foo", 3)); + TEST_1(su_casenmatch("FOO", "foo", 3)); + TEST_1(su_casenmatch("foo", "FOO", 3)); + + TEST_1(su_casenmatch("foo", "foo", 4)); + TEST_1(su_casenmatch("FOO", "foo", 4)); + TEST_1(su_casenmatch("foo", "FOO", 4)); + + TEST_1(su_casematch("foo", "foo")); + TEST_1(su_casematch("FOO", "foo")); + TEST_1(su_casematch("foo", "FOO")); + + TEST_1(!su_casematch("foo_", "foo")); + TEST_1(!su_casematch("FOO_", "foo")); + TEST_1(!su_casematch("foo_", "FOO")); + + TEST_1(su_casenmatch("foo\0X", "foo\0z", 5)); + TEST_1(su_casenmatch("FOO\0X", "foo\0z", 5)); + TEST_1(su_casenmatch("foo\0X", "FOO\0z", 5)); + + END(); +} + +static int test_strmatch(void) +{ + BEGIN(); + + TEST_1(!su_strmatch(NULL, "")); + TEST_1(su_strmatch(NULL, NULL)); + TEST_1(!su_strmatch("", NULL)); + + TEST_1(!su_strnmatch(NULL, "", 1)); + TEST_1(su_strnmatch(NULL, NULL, 1)); + TEST_1(!su_strnmatch("", NULL, 1)); + + TEST_1(su_strnmatch(NULL, "", 0)); + TEST_1(su_strnmatch(NULL, NULL, 0)); + TEST_1(su_strnmatch("", NULL, 0)); + + TEST_1(su_strnmatch("foo", "foo", 3)); + TEST_1(!su_strnmatch("FOO", "foo", 3)); + TEST_1(!su_strnmatch("foo", "FOO", 3)); + + TEST_1(su_strnmatch("foo", "foo", 4)); + TEST_1(!su_strnmatch("FOO", "foo", 4)); + TEST_1(!su_strnmatch("foo", "FOO", 4)); + + TEST_1(su_strmatch("foo", "foo")); + TEST_1(!su_strmatch("FOO", "foo")); + TEST_1(!su_strmatch("foo", "FOO")); + + TEST_1(!su_strmatch("foo_", "foo")); + + TEST_1(su_strnmatch("foo\0X", "foo\0z", 5)); + TEST_1(!su_strnmatch("FOO\0X", "foo\0z", 5)); + TEST_1(!su_strnmatch("foo\0X", "FOO\0z", 5)); + + END(); +} + +static int test_strnspn(void) +{ + BEGIN(); + + TEST(su_strnspn("foobar", 3, ""), 0); + TEST(su_strnspn("foobar", 5, "fo"), 3); + TEST(su_strnspn("foobar", 5, "o"), 0); + TEST(su_strnspn("foobar", 5, "f"), 1); + TEST(su_strnspn("", 5, "fo"), 0); + TEST(su_strnspn("foobarf", 5, "fob"), 4); + + TEST(su_strncspn("foobar", 3, ""), 3); + TEST(su_strncspn("foobar", 5, "bach"), 3); + TEST(su_strncspn("foobar", 5, "ri"), 5); + TEST(su_strncspn("foobar", 5, "b"), 3); + TEST(su_strncspn("", 5, "fo"), 0); + TEST(su_strncspn(NULL, 0, "fo"), 0); + TEST(su_strncspn("foobarf", 5, "a"), 4); + + END(); +} + int main(int argc, char *argv[]) { int retval = 0; @@ -247,7 +344,10 @@ retval |= test_pattern(); fflush(stdout); retval |= test_strcasestr(); fflush(stdout); + retval |= test_casematch(); fflush(stdout); + retval |= test_strmatch(); fflush(stdout); + + retval |= test_strnspn(); fflush(stdout); return retval; } -

1 0