ben.carrasco/freeswitch
1
0 Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-11-14 05:18:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Thu Jan 8 15:13:56 CST 2009 Pekka Pessi <first.last@nokia.com>

Browse Source 
* sip: using <sofia-sip/su_string.h> functions



git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11806 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris committed 2009-02-11 16:52:15 +00:00
1 parent d8f68d7a56
commit cefbcf0a29
16 files changed
+83 -78
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

libs/sofia-sip/libsofia-sip-ua/sip/sip_parser.c
+17 -16
View File
@@ -39,6 +39,7 @@
#define MSG_HDR_T union sip_header_u
#include <sofia-sip/su_tagarg.h>
#include <sofia-sip/su_string.h>
#include "sofia-sip/sip_parser.h"
#include <sofia-sip/msg_mclass.h>
@@ -231,7 +232,7 @@ int sip_version_d(char **ss, char const **ver)
char const *result;
size_t const version_size = sizeof(sip_version_2_0) - 1;
if (strncasecmp(s, sip_version_2_0, version_size) == 0 &&
if (su_casenmatch(s, sip_version_2_0, version_size) &&
!IS_TOKEN(s[version_size])) {
result = sip_version_2_0;
s += version_size;
@@ -260,7 +261,7 @@ int sip_version_d(char **ss, char const **ver)
s[l1 + 1 + l2] = 0;
/* Compare again with compacted version */
if (strcasecmp(s, sip_version_2_0) == 0)
if (su_casematch(s, sip_version_2_0))
result = sip_version_2_0;
}
@@ -459,10 +460,10 @@ issize_t sip_transport_d(char **ss, char const **ttransport)
char *s = *ss;
#define TRANSPORT_MATCH(t) \
(strncasecmp(s+7, t+7, sizeof(t)-8) == 0 && (IS_LWS(s[sizeof(t)])) \
(su_casenmatch(s + 7, t + 7, (sizeof t) - 8) && (IS_LWS(s[sizeof(t)])) \
&& (transport = t, s += sizeof(t) - 1))
if (strncasecmp(s, "SIP/2.0", 7) != 0 ||
if (!su_casenmatch(s, "SIP/2.0", 7) ||
(!TRANSPORT_MATCH(sip_transport_udp) &&
!TRANSPORT_MATCH(sip_transport_tcp) &&
!TRANSPORT_MATCH(sip_transport_sctp) &&
@@ -502,13 +503,13 @@ issize_t sip_transport_d(char **ss, char const **ttransport)
pt[pt_len] = '\0';
/* extra whitespace? */
if (!strcasecmp(transport, sip_transport_udp))
if (su_casematch(transport, sip_transport_udp))
transport = sip_transport_udp;
else if (!strcasecmp(transport, sip_transport_tcp))
else if (su_casematch(transport, sip_transport_tcp))
transport = sip_transport_tcp;
else if (!strcasecmp(transport, sip_transport_sctp))
else if (su_casematch(transport, sip_transport_sctp))
transport = sip_transport_sctp;
else if (!strcasecmp(transport, sip_transport_tls))
else if (su_casematch(transport, sip_transport_tls))
transport = sip_transport_tls;
}
}
@@ -526,10 +527,10 @@ isize_t sip_transport_xtra(char const *transport)
transport == sip_transport_tcp ||
transport == sip_transport_sctp ||
transport == sip_transport_tls ||
strcasecmp(transport, sip_transport_udp) == 0 ||
strcasecmp(transport, sip_transport_tcp) == 0 ||
strcasecmp(transport, sip_transport_sctp) == 0 ||
strcasecmp(transport, sip_transport_tls) == 0)
su_casematch(transport, sip_transport_udp) ||
su_casematch(transport, sip_transport_tcp) ||
su_casematch(transport, sip_transport_sctp) ||
su_casematch(transport, sip_transport_tls))
return 0;
return MSG_STRING_SIZE(transport);
@@ -546,13 +547,13 @@ void sip_transport_dup(char **pp, char const **dd, char const *s)
*dd = s;
else if (s == sip_transport_tls)
*dd = s;
else if (strcasecmp(s, sip_transport_udp) == 0)
else if (su_casematch(s, sip_transport_udp))
*dd = sip_transport_udp;
else if (strcasecmp(s, sip_transport_tcp) == 0)
else if (su_casematch(s, sip_transport_tcp))
*dd = sip_transport_tcp;
else if (strcasecmp(s, sip_transport_sctp) == 0)
else if (su_casematch(s, sip_transport_sctp))
*dd = sip_transport_sctp;
else if (strcasecmp(s, sip_transport_tls) == 0)
else if (su_casematch(s, sip_transport_tls))
*dd = sip_transport_tls;
else
MSG_STRING_DUP(*pp, *dd, s);