kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-16 08:49:01 +00:00
Code Issues Projects Releases Wiki Activity

Fri Jan 16 13:27:39 CST 2009 Pekka Pessi <first.last@nokia.com>

Browse Source 
* soa: fixed restoring state after failed offer



git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11835 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2009-02-11 17:07:59 +00:00
parent 5baf8d20b6
commit 10c67f8219
3 changed files with 52 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/sofia-sip/.update
View File

@ -1 +1 @@
Wed Feb 11 11:06:56 CST 2009 Wed Feb 11 11:07:52 CST 2009

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

@ -938,7 +938,7 @@ soa_base_set_capability_sdp(soa_session_t *ss,
* *
* <i>User SDP</i> is used as basis for SDP Offer/Answer negotiation. It can * <i>User SDP</i> is used as basis for SDP Offer/Answer negotiation. It can
* be very minimal template, consisting just m= line containing media name, * be very minimal template, consisting just m= line containing media name,
* transport protocol port number and list of supported codecs. * transport protocol, port number and list of supported codecs.
* *
* The SDP used as an offer or answer (generated by soa_generate_answer() or * The SDP used as an offer or answer (generated by soa_generate_answer() or
* soa_generate_offer()) is known as <i>local SDP</i> and it is available * soa_generate_offer()) is known as <i>local SDP</i> and it is available
@ -1703,13 +1703,10 @@ int soa_base_process_reject(soa_session_t *ss,
(void)completed; (void)completed;
if (!l_sdp)
return -1;
soa_set_activity(ss, l_sdp->sdp_media, soa_activity_session);
ss->ss_offer_sent = 0; ss->ss_offer_sent = 0;
soa_set_activity(ss, l_sdp ? l_sdp->sdp_media : NULL, soa_activity_session);
return 0; return 0;
} }

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

@ -84,6 +84,11 @@ typedef struct soa_static_session
/** Mapping from session SDP m= lines to user SDP m= lines */ /** Mapping from session SDP m= lines to user SDP m= lines */
int *sss_s2u; int *sss_s2u;
/** State kept from SDP before current offer */
struct {
int *u2s, *s2u;
} sss_previous;
/** Our latest offer or answer */ /** Our latest offer or answer */
sdp_session_t *sss_latest; sdp_session_t *sss_latest;
} }
@ -886,6 +891,7 @@ int soa_sdp_upgrade(soa_session_t *ss,
return 0; return 0;
} }
static
int *u2s_alloc(su_home_t *home, int const *u2s) int *u2s_alloc(su_home_t *home, int const *u2s)
{ {
if (u2s) { if (u2s) {
@ -1318,6 +1324,8 @@ static int offer_answer_step(soa_session_t *ss,
} }
soa_description_free(ss, ss->ss_previous); soa_description_free(ss, ss->ss_previous);
su_free(ss->ss_home, sss->sss_previous.u2s), sss->sss_previous.u2s = NULL;
su_free(ss->ss_home, sss->sss_previous.s2u), sss->sss_previous.s2u = NULL;
if (u2s) { if (u2s) {
u2s = u2s_alloc(ss->ss_home, u2s); u2s = u2s_alloc(ss->ss_home, u2s);
@ -1358,10 +1366,18 @@ static int offer_answer_step(soa_session_t *ss,
if (action == generate_offer) { if (action == generate_offer) {
/* Keep a copy of previous session state */ /* Keep a copy of previous session state */
int *previous_u2s = u2s_alloc(ss->ss_home, sss->sss_u2s);
int *previous_s2u = u2s_alloc(ss->ss_home, sss->sss_s2u);
if ((sss->sss_u2s && !previous_u2s) || (sss->sss_s2u && !previous_s2u))
goto internal_error;
*ss->ss_previous = *ss->ss_local; *ss->ss_previous = *ss->ss_local;
memset(ss->ss_local, 0, (sizeof *ss->ss_local)); memset(ss->ss_local, 0, (sizeof *ss->ss_local));
ss->ss_previous_user_version = ss->ss_local_user_version; ss->ss_previous_user_version = ss->ss_local_user_version;
ss->ss_previous_remote_version = ss->ss_local_remote_version; ss->ss_previous_remote_version = ss->ss_local_remote_version;
sss->sss_previous.u2s = previous_u2s;
sss->sss_previous.s2u = previous_s2u;
} }
SU_DEBUG_7(("soa_static(%p, %s): %s\n", (void *)ss, by, SU_DEBUG_7(("soa_static(%p, %s): %s\n", (void *)ss, by,
@ -1374,6 +1390,8 @@ static int offer_answer_step(soa_session_t *ss,
memset(ss->ss_previous, 0, (sizeof *ss->ss_previous)); memset(ss->ss_previous, 0, (sizeof *ss->ss_previous));
ss->ss_previous_user_version = 0; ss->ss_previous_user_version = 0;
ss->ss_previous_remote_version = 0; ss->ss_previous_remote_version = 0;
su_free(ss->ss_home, sss->sss_previous.u2s), sss->sss_previous.u2s = NULL;
su_free(ss->ss_home, sss->sss_previous.s2u), sss->sss_previous.s2u = NULL;
} }
su_free(ss->ss_home, u2s), su_free(ss->ss_home, s2u); su_free(ss->ss_home, u2s), su_free(ss->ss_home, s2u);
@ -1467,21 +1485,26 @@ static int soa_static_process_answer(soa_session_t *ss,
static int soa_static_process_reject(soa_session_t *ss, static int soa_static_process_reject(soa_session_t *ss,
soa_callback_f *completed) soa_callback_f *completed)
{ {
soa_static_session_t *sss = (soa_static_session_t *)ss;
struct soa_description d[1]; struct soa_description d[1];
if (ss->ss_previous_user_version) { soa_base_process_reject(ss, NULL);
*d = *ss->ss_local;
*ss->ss_local = *ss->ss_previous;
ss->ss_local_user_version = ss->ss_previous_user_version;
ss->ss_local_remote_version = ss->ss_previous_remote_version;
memset(ss->ss_previous, 0, (sizeof *ss->ss_previous)); *d = *ss->ss_local;
soa_description_free(ss, d); *ss->ss_local = *ss->ss_previous;
ss->ss_previous_user_version = 0; ss->ss_local_user_version = ss->ss_previous_user_version;
ss->ss_previous_remote_version = 0; ss->ss_local_remote_version = ss->ss_previous_remote_version;
}
return soa_base_process_reject(ss, NULL); memset(ss->ss_previous, 0, (sizeof *ss->ss_previous));
soa_description_free(ss, d);
su_free(ss->ss_home, sss->sss_previous.u2s), sss->sss_previous.u2s = NULL;
su_free(ss->ss_home, sss->sss_previous.s2u), sss->sss_previous.s2u = NULL;
ss->ss_previous_user_version = 0;
ss->ss_previous_remote_version = 0;
su_free(ss->ss_home, sss->sss_latest), sss->sss_latest = NULL;
return 0;
} }
static int soa_static_activate(soa_session_t *ss, char const *option) static int soa_static_activate(soa_session_t *ss, char const *option)
@ -1496,6 +1519,19 @@ static int soa_static_deactivate(soa_session_t *ss, char const *option)
static void soa_static_terminate(soa_session_t *ss, char const *option) static void soa_static_terminate(soa_session_t *ss, char const *option)
{ {
soa_description_free(ss, ss->ss_user); soa_static_session_t *sss = (soa_static_session_t *)ss;
soa_description_free(ss, ss->ss_local);
su_free(ss->ss_home, sss->sss_u2s), sss->sss_u2s = NULL;
su_free(ss->ss_home, sss->sss_s2u), sss->sss_s2u = NULL;
soa_description_free(ss, ss->ss_previous);
ss->ss_previous_user_version = 0;
ss->ss_previous_remote_version = 0;
su_free(ss->ss_home, sss->sss_previous.u2s), sss->sss_previous.u2s = NULL;
su_free(ss->ss_home, sss->sss_previous.s2u), sss->sss_previous.s2u = NULL;
su_free(ss->ss_home, sss->sss_latest), sss->sss_latest = NULL;
soa_base_terminate(ss, option); soa_base_terminate(ss, option);
} }