diff options
| author | Olle Johansson <oej@edvina.net> | 2006-12-01 18:16:16 +0000 |
|---|---|---|
| committer | Olle Johansson <oej@edvina.net> | 2006-12-01 18:16:16 +0000 |
| commit | 4ce5b7c08036b92e93c2551fc71fcdcfa8c71913 (patch) | |
| tree | 3030bf902cc1bf5d41db3683f8ac604c7c0c5ac1 /channels | |
| parent | ae14123361eb6f4b1e34bf75c9ae7debf7c08a01 (diff) | |
- Remove T.38 early media, since T.38 requires two way communication (imported from 1.4)
- Small fixes to limitonpeer
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48178 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index fd72a8546..e3f82edce 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -3099,9 +3099,9 @@ static int update_call_counter(struct sip_pvt *fup, int event) /* Check the list of users only for incoming calls */ if (global_limitonpeers == FALSE && !outgoing && (u = find_user(name, 1))) { - inuse = &u->inUse; - call_limit = &u->call_limit; - inringing = NULL; + inuse = &u->inUse; + call_limit = &u->call_limit; + inringing = NULL; } else if ( (p = find_peer(ast_strlen_zero(fup->peername) ? name : fup->peername, NULL, 1) ) ) { /* Try to find peer */ inuse = &p->inUse; call_limit = &p->call_limit; @@ -3605,15 +3605,12 @@ static int sip_write(struct ast_channel *ast, struct ast_frame *frame) case AST_FRAME_MODEM: if (p) { sip_pvt_lock(p); - if (p->udptl) { - if ((ast->_state != AST_STATE_UP) && - !ast_test_flag(&p->flags[0], SIP_PROGRESS_SENT) && - !ast_test_flag(&p->flags[0], SIP_OUTGOING)) { - transmit_response_with_t38_sdp(p, "183 Session Progress", &p->initreq, XMIT_UNRELIABLE); - ast_set_flag(&p->flags[0], SIP_PROGRESS_SENT); - } + /* UDPTL requires two-way communication, so early media is not needed here. + we simply forget the frames if we get modem frames before the bridge is up. + Fax will re-transmit. + */ + if (p->udptl && ast->_state != AST_STATE_UP) res = ast_udptl_write(p->udptl, frame); - } sip_pvt_unlock(p); } break; @@ -16268,10 +16265,10 @@ static int reload_config(enum channelreloadreason reason) compactheaders = ast_true(v->value); } else if (!strcasecmp(v->name, "notifymimetype")) { ast_copy_string(default_notifymime, v->value, sizeof(default_notifymime)); + } else if (!strcasecmp(v->name, "limitonpeers")) { + global_limitonpeers = ast_true(v->value); } else if (!strcasecmp(v->name, "notifyringing")) { global_notifyringing = ast_true(v->value); - } else if (!strcasecmp(v->name, "limitpeersonly")) { - global_limitonpeers = ast_true(v->value); } else if (!strcasecmp(v->name, "notifyhold")) { global_notifyhold = ast_true(v->value); } else if (!strcasecmp(v->name, "alwaysauthreject")) { |