diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2003-08-15 04:38:39 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2003-08-15 04:38:39 +0000 |
| commit | a1136fedf44ba8d0bada48295ac00961696b4bf5 (patch) | |
| tree | 14f5bc090ee5daef3022a525dcf8035720d01227 /channels | |
| parent | a34be8cd3f45e4c2f4f661c29f0810f4a379576e (diff) | |
Asterisk:
#72 - Should eliminate probs on VMWI
#41 - Dynamic add survives reload
#73 - Make festival honor its arguments
#93 - Make events on FXO interfaces more logical
#26 - Prefer "bindaddr" to logical address for registrations
??? - Record crashes AGI
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1338 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rwxr-xr-x | channels/chan_sip.c | 3 | ||||
| -rwxr-xr-x | channels/chan_zap.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index b4602275a..fd5971e0f 100755 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -2833,6 +2833,9 @@ static int transmit_register(struct sip_registry *r, char *cmd, char *auth) strncpy(p->peername, r->username, sizeof(p->peername)-1); strncpy(p->username, r->username, sizeof(p->username)-1); strncpy(p->exten, r->contact, sizeof(p->exten) - 1); + /* Always bind to our IP if specified */ + if (bindaddr.sin_addr.s_addr) + memcpy(&p->ourip, &bindaddr.sin_addr, sizeof(p->ourip)); build_contact(p); } diff --git a/channels/chan_zap.c b/channels/chan_zap.c index fe490c5d7..25b25f2af 100755 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -4348,7 +4348,7 @@ static int handle_init_event(struct zt_pvt *i, int event) } } else { /* Check for callerid, digits, etc */ - chan = zt_new(i, AST_STATE_DOWN, 0, SUB_REAL, 0); + chan = zt_new(i, AST_STATE_RESERVED, 0, SUB_REAL, 0); if (chan) { if (has_voicemail(i)) #ifdef ZT_TONE_STUTTER @@ -4560,7 +4560,7 @@ static void *do_monitor(void *data) if (last->msgstate != res) { int x; ast_log(LOG_DEBUG, "Message status for %s changed from %d to %d on %d\n", last->mailbox, last->msgstate, res, last->channel); - x = ZT_FLUSH_WRITE; + x = ZT_FLUSH_BOTH; res2 = ioctl(last->subs[SUB_REAL].zfd, ZT_FLUSH, &x); if (res2) ast_log(LOG_WARNING, "Unable to flush input on channel %d\n", last->channel); |