Display invalid extension when there is one, fix minor OSP typo, Don't send 200 OK...

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index d599a0d22de8ed4ee1ccb63582058962c5116b94..28b0ad9affb388cd01ad291fb1c71af2ca9a4d7b 100755 (executable)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -7079,7 +7079,7 @@ static int handle_request(struct sip_pvt *p, struct sip_request *req, struct soc
 
                if (!ignore && p)
                        p->lastinvite = seqno;
-               if (p) {
+               if (p && !p->needdestroy) {
                    if (!(p->expiry = atoi(get_header(req, "Expires")))) {
                        transmit_response(p, "200 OK", req);
                        p->needdestroy = 1;

diff --git a/pbx.c b/pbx.c
index 7344dd328e9764acf54449f339cfa6d40e5a2395..f96e7de8c70b02562a7d3ba422c65ed7a32c57cf 100755 (executable)
--- a/pbx.c
+++ b/pbx.c
@@ -1878,7 +1878,7 @@ int ast_pbx_run(struct ast_channel *c)
                                                strncpy(c->exten, "i", sizeof(c->exten)-1);
                                                c->priority = 1;
                                        } else {
-                                               ast_log(LOG_WARNING, "Invalid extension, but no rule 'i' in context '%s'\n", c->context);
+                                               ast_log(LOG_WARNING, "Invalid extension '%s', but no rule 'i' in context '%s'\n", exten, c->context);
                                                goto out;
                                        }
                                } else {

diff --git a/res/res_osp.c b/res/res_osp.c
index 9aa8d66da94757ec09ac6a56cd1bf6ef23a98ff7..94aaaf333c86490b3facf300efe064ec9774437d 100755 (executable)
--- a/res/res_osp.c
+++ b/res/res_osp.c
@@ -452,7 +452,7 @@ int ast_osp_validate(char *provider, char *token, int *handle, unsigned int *tim
        }
        callerid = l;
        ast_mutex_lock(&osplock);
-       ast_inet_ntoa(ip, sizeof(ip), addr));
+       ast_inet_ntoa(ip, sizeof(ip), addr);
        osp = providers;
        while(osp) {
                if (!strcasecmp(osp->name, provider)) {