diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-06 16:00:03 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-06 16:00:03 +0000 |
| commit | 3baf66061293ce8c17f9d25a9671f1ddfdbaa98a (patch) | |
| tree | 3f0acf926fc3e991c54e230d262c7b09fad76bae | |
| parent | 533501bcc1cefd0edc98bed97a1792e7c658c12f (diff) | |
Merged revisions 73679 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r73679 | russell | 2007-07-06 10:57:25 -0500 (Fri, 06 Jul 2007) | 15 lines
Merged revisions 73678 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r73678 | russell | 2007-07-06 10:55:41 -0500 (Fri, 06 Jul 2007) | 7 lines
(closes issue #10125)
Reported by: makoto
Patches submitted by: makoto
This fixes a crash in chan_sip that happens when the bindaddr setting is not
valid on Asterisk startup, gets fixed, and then a reload gets issued.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@73680 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_sip.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index ee68902b5..53e637993 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -16002,8 +16002,12 @@ static void *do_monitor(void *data) sip_do_reload(sip_reloadreason); /* Change the I/O fd of our UDP socket */ - if (sipsock > -1) - sipsock_read_id = ast_io_change(io, sipsock_read_id, sipsock, NULL, 0, NULL); + if (sipsock > -1) { + if (sipsock_read_id) + sipsock_read_id = ast_io_change(io, sipsock_read_id, sipsock, NULL, 0, NULL); + else + sipsock_read_id = ast_io_add(io, sipsock, sipsock_read, AST_IO_IN, NULL); + } } /* Check for dialogs needing to be killed */ |