kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1476 in FS/freeswitch from ~ANDYWOLK/freeswitch:bugfix/FS-9753-accessing-the-wss-interface-via-regular to master 

* commit 'f37f41ccb2126ad9f32bb1214bf58aaef9518b00':
  FS-9753: [mod_sofia] Fix crash when accessing the WSS interface via regular HTTPS
This commit is contained in:
Mike Jerris 2018-02-21 21:27:57 +00:00
parent 38153a37ed f37f41ccb2
commit 5a8a1f4415
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/sofia-sip/.update
View File

@ -1 +1 @@
Mon Jun 26 14:53:11 CDT 2017 Wed Feb 21 13:55:11 CDT 2018

6
libs/sofia-sip/libsofia-sip-ua/tport/tport.c
View File

@ -1059,6 +1059,8 @@ int tport_register_secondary(tport_t *self, su_wakeup_f wakeup, int events)
self->tp_index = i; self->tp_index = i;
self->tp_events = events; self->tp_events = events;
/* Can't be added to list of opened if already closed */
if (!tport_is_closed(self))
tprb_append(&self->tp_pri->pri_open, self); tprb_append(&self->tp_pri->pri_open, self);
return 0; return 0;
} }
@ -2627,7 +2629,9 @@ int tport_accept(tport_primary_t *pri, int events)
SU_CANONIZE_SOCKADDR(su); SU_CANONIZE_SOCKADDR(su);
if (/* Name this transport */ if (/* Prevent being marked as connected if already closed */
!tport_is_closed(self) &&
/* Name this transport */
tport_setname(self, pri->pri_protoname, ai, NULL) != -1 tport_setname(self, pri->pri_protoname, ai, NULL) != -1
/* Register this secondary */ /* Register this secondary */
&& &&