some code clean up and catch for a act_hook being called

without a packet.

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

diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c
index 58e4a5d90a93cd705e22b8b003dee52e9e1f5c69..9bf77cc27358e672854be0c404d1023ae4ff8e43 100644 (file)
--- a/channels/chan_jingle.c
+++ b/channels/chan_jingle.c
@@ -168,7 +168,7 @@ AST_MUTEX_DEFINE_STATIC(usecnt_lock);
 
 static int global_capability = AST_FORMAT_ULAW | AST_FORMAT_ALAW | AST_FORMAT_GSM | AST_FORMAT_H263;
 
-AST_MUTEX_DEFINE_STATIC(jinglelock); /*!< Protect the interface list (of sip_pvt's) */
+AST_MUTEX_DEFINE_STATIC(jinglelock); /*!< Protect the interface list (of jingle_pvt's) */
 
 /* Forward declarations */
 static struct ast_channel *jingle_request(const char *type, int format, void *data, int *cause);
@@ -448,7 +448,7 @@ static int jingle_set_rtp_peer(struct ast_channel *chan, struct ast_rtp *rtp, st
 
 static int jingle_response(struct jingle *client, ikspak *pak, const char *reasonstr, const char *reasonstr2)
 {
-       iks *response, *error = NULL, *reason;
+       iks *response = NULL, *error = NULL, *reason = NULL;
        int res = -1;
 
        response = iks_new("iq");
@@ -1238,8 +1238,8 @@ static int jingle_sendhtml(struct ast_channel *ast, int subclass, const char *da
 }
 static int jingle_transmit_invite(struct jingle_pvt *p)
 {
-       struct jingle *jingle;
-       struct aji_client *client;
+       struct jingle *jingle = NULL;
+       struct aji_client *client = NULL;
        iks *iq, *desc, *session;
        iks *payload_eg711u, *payload_pcmu;
 
@@ -1577,7 +1577,8 @@ static int jingle_load_config(void)
                        ast_copy_string(context, var->value, sizeof(context));
                else if (!strcasecmp(var->name, "externip"))
                        ast_copy_string(externip, var->value, sizeof(externip));
-#if 0
+/*  Idea to allow for custom candidates  */
+/*
                else if (!strcasecmp(var->name, "candidate")) {
                        candidate = jingle_create_candidate(var->value);
                        if (candidate) {
@@ -1585,7 +1586,7 @@ static int jingle_load_config(void)
                                global_candidates = candidate;
                        }
                }
-#endif
+*/
        }
        while (cat) {
                if (strcasecmp(cat, "general")) {
@@ -1610,7 +1611,8 @@ static int jingle_load_config(void)
                                        else if (!strcasecmp(var->name, "context"))
                                                ast_copy_string(member->context, var->value,
                                                                                sizeof(member->context));
-#if 0
+/*  Idea to allow for custom candidates  */
+/*
                                        else if (!strcasecmp(var->name, "candidate")) {
                                                candidate = jingle_create_candidate(var->value);
                                                if (candidate) {
@@ -1618,7 +1620,7 @@ static int jingle_load_config(void)
                                                        member->ourcandidates = candidate;
                                                }
                                        }
-#endif
+*/
                                        var = var->next;
                                }
                                ASTOBJ_UNLOCK(member);

diff --git a/res/res_jabber.c b/res/res_jabber.c
index 48c375cac20af4b16128c2f7dfa527d41296329a..65064170e742e2cf19b792d7db60cf409837f98c 100644 (file)
--- a/res/res_jabber.c
+++ b/res/res_jabber.c
@@ -127,7 +127,7 @@ static char *app_ajisend = "JabberSend";
 static char *ajisend_synopsis = "JabberSend(jabber,screenname,message)";
 
 static char *ajisend_descrip =
-"JabberRSend(Jabber,ScreenName,Message)\n"
+"JabberSend(Jabber,ScreenName,Message)\n"
 "  Jabber - Client or transport Asterisk uses to connect to Jabber\n" 
 "  ScreenName - User Name to message.\n" 
 "  Message - Message to be sent to the buddy\n";
@@ -444,6 +444,11 @@ static int aji_act_hook(void *data, int type, iks *node)
        ikspak *pak = NULL;
        iks *auth = NULL;
 
+       if(!node) {
+               ast_log(LOG_ERROR, "aji_act_hook was called with out a packet\n"); /* most likely cause type is IKS_NODE_ERROR lost connection */
+               return IKS_HOOK;
+       }
+
        pak = iks_packet(node);
 
        if (client->component == AJI_CLIENT) {
@@ -1003,8 +1008,7 @@ static int aji_dinfo_handler(void *data, ikspak *pak)
  */
 static void aji_handle_iq(struct aji_client *client, iks *node)
 {
-       if (option_verbose > 4)
-               ast_verbose("MWAHHAHAHA NOTHING TO SEE HERE!\n");
+       /*Nothing to see here */
 }
 
 /*!
@@ -1908,7 +1912,7 @@ static int aji_test(int fd, int argc, char *argv[])
                return RESULT_FAILURE;
        }
 
-       /* XXX Does Matt really want everyone to use his personal address for tests? */
+       /* XXX Does Matt really want everyone to use his personal address for tests? */ /* XXX yes he does */
        ast_aji_send(client, "mogorman@astjab.org", "blahblah");
        ASTOBJ_CONTAINER_TRAVERSE(&client->buddies, 1, {
                ASTOBJ_RDLOCK(iterator);