Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch

This commit is contained in:
David Yat Sin 2012-01-16 17:15:08 -05:00
commit 708f8f1fc8
3 changed files with 5 additions and 5 deletions

View File

@ -1 +1 @@
Sun Dec 18 11:07:07 EST 2011
Mon Jan 16 12:47:24 CST 2012

View File

@ -359,7 +359,7 @@ void tport_capt_msg(tport_t const *self, msg_t *msg, size_t n,
assert(self); assert(msg);
su = msg_addr(msg);
su_self = self->tp_addr;
su_self = self->tp_pri->pri_primary->tp_addr;
mr = self->tp_master;
@ -402,8 +402,8 @@ void tport_capt_msg(tport_t const *self, msg_t *msg, size_t n,
}
#endif
hep_header.hp_dport = dst ? su->su_port : htons(atoi(self->tp_port));
hep_header.hp_sport = dst ? htons(atoi(self->tp_port)) : su->su_port;
hep_header.hp_dport = dst ? su->su_port : su_self->su_port;
hep_header.hp_sport = dst ? su_self->su_port : su->su_port;
/* Copy hepheader */

View File

@ -454,7 +454,7 @@ switch_status_t sofia_on_hangup(switch_core_session_t *session)
}
if (!((use_my_cause = switch_channel_get_variable(channel, "sip_ignore_remote_cause")) && switch_true(use_my_cause))) {
ps_cause = switch_channel_get_variable(channel, SWITCH_PROTO_SPECIFIC_HANGUP_CAUSE_VARIABLE);
ps_cause = switch_channel_get_variable(channel, "last_bridge_" SWITCH_PROTO_SPECIFIC_HANGUP_CAUSE_VARIABLE);
}
if (!zstr(ps_cause) && (!strncasecmp(ps_cause, "sip:", 4) || !strncasecmp(ps_cause, "sips:", 5))) {