kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-17 09:12:25 +00:00
Code Issues Projects Releases Wiki Activity

Tue May 20 09:35:37 EDT 2008 Pekka.Pessi@nokia.com

Browse Source 
* soa.c: fixed klocwork issues



git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8617 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2008-05-25 15:05:09 +00:00
parent f2a92f3b38
commit 9273f923ae
2 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/sofia-sip/.update
View File

@ -1 +1 @@
Sun May 25 11:03:45 EDT 2008 Sun May 25 11:05:03 EDT 2008

38
libs/sofia-sip/libsofia-sip-ua/soa/soa.c
View File

@ -882,36 +882,40 @@ int soa_set_capability_sdp(soa_session_t *ss,
/** Set capabilities */ /** Set capabilities */
int int
soa_base_set_capability_sdp(soa_session_t *ss, soa_base_set_capability_sdp(soa_session_t *ss,
sdp_session_t *sdp, char const *str0, isize_t len0) sdp_session_t *_sdp,
char const *str0, isize_t len0)
{ {
sdp_session_t sdp[1];
sdp_origin_t o[1] = {{ sizeof(o) }}; sdp_origin_t o[1] = {{ sizeof(o) }};
sdp_connection_t *c, c0[1] = {{ sizeof(c0) }}; sdp_connection_t *c, c0[1] = {{ sizeof(c0) }};
char c_address[64]; char c_address[64];
sdp_time_t t[1] = {{ sizeof(t) }}; sdp_time_t t[1] = {{ sizeof(t) }};
sdp_media_t *m; sdp_media_t *m;
*sdp = *_sdp;
if (sdp->sdp_origin) if (sdp->sdp_origin)
*o = *sdp->sdp_origin; *o = *sdp->sdp_origin;
else else
o->o_address = c0; o->o_address = c0;
sdp->sdp_origin = o;
if (soa_init_sdp_origin(ss, o, c_address) < 0) if (soa_init_sdp_origin(ss, o, c_address) < 0)
return -1; return -1;
if (!sdp->sdp_subject) sdp->sdp_origin = o;
sdp->sdp_subject = "-";
sdp->sdp_time = t; if (!sdp->sdp_subject)
sdp->sdp_subject = "-"; /* s=- */
sdp->sdp_time = t; /* t=0 0 */
/* Set port to zero - or should we check that port is already zero? */ /* Set port to zero - or should we check that port is already zero? */
for (m = sdp->sdp_media; m; m = m->m_next) for (m = sdp->sdp_media; m; m = m->m_next)
m->m_port = 0; m->m_port = 0;
c = sdp->sdp_origin->o_address;
if (sdp->sdp_connection == NULL) { if (sdp->sdp_connection == NULL) {
c = sdp->sdp_origin->o_address;
for (m = sdp->sdp_media; m; m = m->m_next) for (m = sdp->sdp_media; m; m = m->m_next)
if (m->m_connections == NULL) if (m->m_connections == NULL)
break; break;
@ -1977,6 +1981,9 @@ int soa_set_sdp(soa_session_t *ss,
sdp_parser_t *parser = NULL; sdp_parser_t *parser = NULL;
sdp_session_t sdp[1]; sdp_session_t sdp[1];
if (ss == NULL)
return -1;
switch (what) { switch (what) {
case soa_capability_sdp_kind: case soa_capability_sdp_kind:
ssd = ss->ss_caps; ssd = ss->ss_caps;
@ -1994,15 +2001,16 @@ int soa_set_sdp(soa_session_t *ss,
return -1; return -1;
} }
if (sdp_str && str_len == -1) if (sdp0) {
str_len = strlen(sdp_str);
if (sdp0)
new_version = sdp_session_cmp(sdp0, ssd->ssd_sdp) != 0; 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 || new_version = !ssd->ssd_unparsed ||
str0ncmp(sdp_str, ssd->ssd_unparsed, str_len) != 0 || str0ncmp(sdp_str, ssd->ssd_unparsed, str_len + 1) != 0;
ssd->ssd_unparsed[str_len] != '\0'; }
else else
return (void)su_seterrno(EINVAL), -1; return (void)su_seterrno(EINVAL), -1;