Merge OSP updates from matt nicholson (with changes)

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

diff --git a/apps/app_dial.c b/apps/app_dial.c
index 0226995d2157e6d5a49eb5ccad4d99f548f43d12..307d80cc39b89eb6718765caed966fdb1000dae5 100755 (executable)
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -1017,7 +1017,7 @@ static int dial_exec(struct ast_channel *chan, void *data)
                time(&answer_time);
 #ifdef OSP_SUPPORT
                /* Once call is answered, ditch the OSP Handle */
-               pbx_builtin_setvar_helper(chan, "OSPHANDLE", "");
+               pbx_builtin_setvar_helper(chan, "_OSPHANDLE", "");
 #endif         
                strncpy(status, "ANSWER", sizeof(status) - 1);
                /* Ah ha!  Someone answered within the desired timeframe.  Of course after this

diff --git a/apps/app_osplookup.c b/apps/app_osplookup.c
index 4110d740bb8b858f9b285c35f1a31a9984dd5088..41f5d002fcb9ff4ebecaae4b2cfa8c1c003794ac 100755 (executable)
--- a/apps/app_osplookup.c
+++ b/apps/app_osplookup.c
@@ -113,12 +113,13 @@ static int osplookup_exec(struct ast_channel *chan, void *data)
        if ((res = ast_osp_lookup(chan, provider, temp, chan->cid.cid_num, &result)) > 0) {
                char tmp[80];
                snprintf(tmp, sizeof(tmp), "%d", result.handle);
-               pbx_builtin_setvar_helper(chan, "OSPHANDLE", tmp);
-               pbx_builtin_setvar_helper(chan, "OSPTECH", result.tech);
-               pbx_builtin_setvar_helper(chan, "OSPDEST", result.dest);
-               pbx_builtin_setvar_helper(chan, "OSPTOKEN", result.token);
+               pbx_builtin_setvar_helper(chan, "_OSPHANDLE", tmp);
+               pbx_builtin_setvar_helper(chan, "_OSPTECH", result.tech);
+               pbx_builtin_setvar_helper(chan, "_OSPDEST", result.dest);
+               pbx_builtin_setvar_helper(chan, "_OSPTOKEN", result.token);
                snprintf(tmp, sizeof(tmp), "%d", result.numresults);
-               pbx_builtin_setvar_helper(chan, "OSPRESULTS", tmp);
+               pbx_builtin_setvar_helper(chan, "_OSPRESULTS", tmp);
+
        } else {
                if (!res)
                        ast_log(LOG_NOTICE, "OSP Lookup failed for '%s' (provider '%s')\n", temp, provider ? provider : "<default>");
@@ -153,12 +154,12 @@ static int ospnext_exec(struct ast_channel *chan, void *data)
                if ((res = ast_osp_next(&result, cause)) > 0) {
                        char tmp[80];
                        snprintf(tmp, sizeof(tmp), "%d", result.handle);
-                       pbx_builtin_setvar_helper(chan, "OSPHANDLE", tmp);
-                       pbx_builtin_setvar_helper(chan, "OSPTECH", result.tech);
-                       pbx_builtin_setvar_helper(chan, "OSPDEST", result.dest);
-                       pbx_builtin_setvar_helper(chan, "OSPTOKEN", result.token);
+                       pbx_builtin_setvar_helper(chan, "_OSPHANDLE", tmp);
+                       pbx_builtin_setvar_helper(chan, "_OSPTECH", result.tech);
+                       pbx_builtin_setvar_helper(chan, "_OSPDEST", result.dest);
+                       pbx_builtin_setvar_helper(chan, "_OSPTOKEN", result.token);
                        snprintf(tmp, sizeof(tmp), "%d", result.numresults);
-                       pbx_builtin_setvar_helper(chan, "OSPRESULTS", tmp);
+                       pbx_builtin_setvar_helper(chan, "_OSPRESULTS", tmp);
                }
        } else {
                if (!res) {
@@ -204,7 +205,7 @@ static int ospfinished_exec(struct ast_channel *chan, void *data)
        result.handle = -1;
        if (temp && strlen(temp) && (sscanf(temp, "%i", &result.handle) == 1) && (result.handle > -1)) {
                if (!ast_osp_terminate(result.handle, cause, start, duration)) {
-                       pbx_builtin_setvar_helper(chan, "OSPHANDLE", "");
+                       pbx_builtin_setvar_helper(chan, "_OSPHANDLE", "");
                        res = 1;
                }
        } else {

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 77c1b4f2414f5c16a40792d0d5de99fc0980365b..174f9032d8ac25a0ec098971e16a62a33df97ded 100755 (executable)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -161,6 +161,8 @@ static int rpeerobjs = 0;
 static int apeerobjs = 0;
 static int regobjs = 0;
 
+static int global_allowguest = 0;    /* allow unathuncated peers to connect? */
+
 #define DEFAULT_MWITIME 10
 static int global_mwitime = DEFAULT_MWITIME;   /* Time between MWI checks for peers */
 
@@ -1444,6 +1446,7 @@ static int sip_call(struct ast_channel *ast, char *dest, int timeout)
 #ifdef OSP_SUPPORT
        if (!osptoken || !osphandle || (sscanf(osphandle, "%i", &p->osphandle) != 1)) {
                /* Force Disable OSP support */
+               ast_log(LOG_DEBUG, "Disabling OSP support for this call. osptoken = %s, osphandle = %s\n", osptoken, osphandle);
                osptoken = NULL;
                osphandle = NULL;
                p->osphandle = -1;
@@ -3799,8 +3802,13 @@ static int transmit_invite(struct sip_pvt *p, char *cmd, int sdp, char *auth, ch
        }
 #ifdef OSP_SUPPORT
        if (osptoken && !ast_strlen_zero(osptoken)) {
+               ast_log(LOG_DEBUG,"Adding OSP Token: %s\n", osptoken);
                add_header(&req, "P-OSP-Auth-Token", osptoken);
        }       
+       else
+       {
+               ast_log(LOG_DEBUG,"NOT Adding OSP Token\n");
+       }
 #endif
        if (distinctive_ring && !ast_strlen_zero(distinctive_ring))
        {
@@ -4864,7 +4872,8 @@ static int check_auth(struct sip_pvt *p, struct sip_request *req, char *randdata
                        return -1;
                
                snprintf(tmp, sizeof(tmp), "%d", p->osphandle);
-               pbx_builtin_setvar_helper(p->owner, "OSPHANDLE", tmp);
+               pbx_builtin_setvar_helper(p->owner, "_OSPHANDLE", tmp);
+
 
                /* If ospauth is 'exclusive' don't require further authentication */
                if ((ast_test_flag(p, SIP_OSPAUTH) == SIP_OSPAUTH_EXCLUSIVE) ||
@@ -5669,8 +5678,21 @@ static int check_user_full(struct sip_pvt *p, struct sip_request *req, char *cmd
                                        p->noncodeccapability &= ~AST_RTP_DTMF;
                        }
                        ASTOBJ_UNREF(peer,sip_destroy_peer);
-               } else if (debug)
-                       ast_verbose("Found no matching peer or user for '%s:%d'\n", ast_inet_ntoa(iabuf, sizeof(iabuf), p->recv.sin_addr), ntohs(p->recv.sin_port));
+               } else { 
+                       if (debug)
+                               ast_verbose("Found no matching peer or user for '%s:%d'\n", ast_inet_ntoa(iabuf, sizeof(iabuf), p->recv.sin_addr), ntohs(p->recv.sin_port));
+
+                       /* do we allow guests? */
+                       if (!global_allowguest)
+                               res = -1;  /* we don't want any guests, authentication will fail */
+#ifdef OSP_SUPPORT                     
+                       else if (global_allowguest == 2) {
+                               ast_copy_flags(p, &global_flags, SIP_OSPAUTH);
+                               res = check_auth(p, req, p->randdata, sizeof(p->randdata), "", "", "", cmd, uri, reliable, ignore); 
+                       }
+#endif
+               }
+
        }
 
        if (user)
@@ -8924,6 +8946,7 @@ static int reload_config(void)
        regcontext[0] = '\0';
        tos = 0;
        expiry = DEFAULT_EXPIRY;
+       global_allowguest = 1;
 
        /* Read the [general] config section of sip.conf (or from realtime config) */
        v = ast_variable_browse(cfg, "general");

diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample
index 3f14cbf23f95174caff2d1c68eea53fd5d40d322..a70eeedc4c668e948f2601840cacd70e0ecf4d11 100755 (executable)
--- a/configs/sip.conf.sample
+++ b/configs/sip.conf.sample
@@ -22,6 +22,8 @@
 
 [general]
 context=default                        ; Default context for incoming calls
+;allowguest=no                  ; Allow or reject guest calls (default is yes, this can also be set to 'osp'
+                                ; if asterisk was compiled with OSP support.
 ;recordhistory=yes             ; Record SIP history by default 
                                ; (see sip history / sip no history)
 ;realm=mydomain.tld            ; Realm for digest authentication

diff --git a/res/res_osp.c b/res/res_osp.c
index f3711b32fd650ebd2cf2b38c839d4dc45ba2cdd8..a9571ee7fa7e4870c00fb0433d7896d13eeb0c2e 100755 (executable)
--- a/res/res_osp.c
+++ b/res/res_osp.c
@@ -496,6 +496,7 @@ int ast_osp_lookup(struct ast_channel *chan, char *provider, char *extension, ch
        char source[OSP_MAX] = ""; /* Same length as osp->source */
        char uniqueid[32] = "";
        char callednum[2048]="";
+       char callingnum[2048]="";
        char destination[2048]="";
        char token[2000];
        char tmp[256]="", *l, *n;
@@ -559,9 +560,9 @@ int ast_osp_lookup(struct ast_channel *chan, char *provider, char *extension, ch
                                        tokenlen = sizeof(token);
                                        result->numresults = counts - 1;
                                        if (!OSPPTransactionGetFirstDestination(result->handle, 0, NULL, NULL, &timelimit, &callidlen, uniqueid, 
-                                               sizeof(callednum), callednum, sizeof(destination), destination, 0, NULL, &tokenlen, token)) {
-                                               ast_log(LOG_DEBUG, "Got destination '%s' and '%s' for '%s' (provider '%s')\n",
-                                                       destination, callednum, extension, provider);
+                                               sizeof(callednum), callednum, sizeof(callingnum), callingnum, sizeof(destination), destination, 0, NULL, &tokenlen, token)) {
+                                               ast_log(LOG_DEBUG, "Got destination '%s' and called: '%s' calling: '%s' for '%s' (provider '%s')\n",
+                                                       destination, callednum, callingnum, extension, provider);
                                                do {
                                                        ast_base64encode(result->token, token, tokenlen, sizeof(result->token) - 1);
                                                        if ((strlen(destination) > 2) && !OSPPTransactionGetDestProtocol(result->handle, &prot)) {
@@ -577,6 +578,10 @@ int ast_osp_lookup(struct ast_channel *chan, char *provider, char *extension, ch
                                                                        strncpy(result->tech, "SIP", sizeof(result->tech) - 1);
                                                                        snprintf(result->dest, sizeof(result->dest), "%s@%s", callednum, destination + 1);
                                                                        break;
+                                                               case OSPE_DEST_PROT_IAX:
+                                                                       strncpy(result->tech, "IAX", sizeof(result->tech) - 1);
+                                                                       snprintf(result->dest, sizeof(result->dest), "%s@%s", callednum, destination + 1);
+                                                                       break;
                                                                default:
                                                                        ast_log(LOG_DEBUG, "Unknown destination protocol '%d', skipping...\n", prot);
                                                                        res = 0;
@@ -584,7 +589,7 @@ int ast_osp_lookup(struct ast_channel *chan, char *provider, char *extension, ch
                                                                if (!res && result->numresults) {
                                                                        result->numresults--;
                                                                        if (OSPPTransactionGetNextDestination(result->handle, OSPC_FAIL_INCOMPATIBLE_DEST, 0, NULL, NULL, &timelimit, &callidlen, uniqueid, 
-                                                                                       sizeof(callednum), callednum, sizeof(destination), destination, 0, NULL, &tokenlen, token)) {
+                                                                                       sizeof(callednum), callednum, sizeof(callingnum), callingnum, sizeof(destination), destination, 0, NULL, &tokenlen, token)) {
                                                                                        break;
                                                                        }
                                                                }
@@ -624,6 +629,7 @@ int ast_osp_next(struct ast_osp_result *result, int cause)
        unsigned int callidlen;
        char uniqueid[32] = "";
        char callednum[2048]="";
+       char callingnum[2048]="";
        char destination[2048]="";
        char token[2000];
        OSPE_DEST_PROT prot;
@@ -640,7 +646,7 @@ int ast_osp_next(struct ast_osp_result *result, int cause)
                        while(!res && result->numresults) {
                                result->numresults--;
                                if (!OSPPTransactionGetNextDestination(result->handle, OSPC_FAIL_INCOMPATIBLE_DEST, 0, NULL, NULL, &timelimit, &callidlen, uniqueid, 
-                                                                       sizeof(callednum), callednum, sizeof(destination), destination, 0, NULL, &tokenlen, token)) {
+                                                                       sizeof(callednum), callednum, sizeof(callingnum), callingnum, sizeof(destination), destination, 0, NULL, &tokenlen, token)) {
                                        ast_base64encode(result->token, token, tokenlen, sizeof(result->token) - 1);
                                        if ((strlen(destination) > 2) && !OSPPTransactionGetDestProtocol(result->handle, &prot)) {
                                                res = 1;
@@ -655,6 +661,10 @@ int ast_osp_next(struct ast_osp_result *result, int cause)
                                                        strncpy(result->tech, "SIP", sizeof(result->tech) - 1);
                                                        snprintf(result->dest, sizeof(result->dest), "%s@%s", callednum, destination + 1);
                                                        break;
+                                               case OSPE_DEST_PROT_IAX:
+                                                       strncpy(result->tech, "IAX", sizeof(result->tech) - 1);
+                                                       snprintf(result->dest, sizeof(result->dest), "%s@%s", callednum, destination + 1);
+                                                       break;
                                                default:
                                                        ast_log(LOG_DEBUG, "Unknown destination protocol '%d', skipping...\n", prot);
                                                        res = 0;
@@ -700,10 +710,21 @@ int ast_osp_terminate(int handle, int cause, time_t start, time_t duration)
        unsigned int dummy = 0;
        int res = -1;
        enum OSPEFAILREASON reason;
+
+       time_t endTime = 0;
+       time_t alertTime = 0;
+       time_t connectTime = 0;
+       unsigned isPddInfoPresent = 0;
+       unsigned pdd = 0;
+       unsigned releaseSource = 0;
+       unsigned char *confId = "";
+       
        reason = cause2reason(cause);
        if (OSPPTransactionRecordFailure(handle, reason))
                ast_log(LOG_WARNING, "Failed to record call termination for handle %d\n", handle);
-       else if (OSPPTransactionReportUsage(handle, duration, start, 0, 0, 0, 0, &dummy, NULL))
+       else if (OSPPTransactionReportUsage(handle, duration, start,
+                              endTime,alertTime,connectTime,isPddInfoPresent,pdd,releaseSource,confId,
+                              0, 0, 0, 0, &dummy, NULL))
                ast_log(LOG_WARNING, "Failed to report duration for handle %d\n", handle);
        else {
                ast_log(LOG_DEBUG, "Completed recording handle %d\n", handle);