- Remove T.38 early media, since T.38 requires two way communication (imported from...

- Small fixes to limitonpeer

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48178 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index fd72a8546e5972052e76525bc9a7669d45d5cd1f..e3f82edceead79b7b46bcd7f16f3e03d29d11813 100644 (file)
--- 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")) {

diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample
index 6bdebd6c356e26e28ac9be1ae0d52a6fd21320f0..f706f25855accb98b62e4f097e4c54a8a999f37a 100644 (file)
--- a/configs/sip.conf.sample
+++ b/configs/sip.conf.sample
@@ -195,6 +195,12 @@ srvlookup=yes                      ; Enable DNS SRV lookups on outbound calls
 ;notifyhold = yes              ; Notify subscriptions on HOLD state (default: no)
                                ; Turning on notifyringing and notifyhold will add a lot
                                ; more database transactions if you are using realtime.
+;limitonpeer = yes             ; Apply call limits on peers only. This will improve 
+                               ; status notification when you are using type=friend
+                               ; Inbound calls, that really apply to the user part
+                               ; of a friend will now be added to and compared with
+                               ; the peer limit instead of applying two call limits,
+                               ; one for the peer and one for the user.
 
 ;----------------------------------------- T.38 FAX PASSTHROUGH SUPPORT -----------------------
 ;