diff options
| author | mogorman <mogorman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-08 17:07:41 +0000 |
|---|---|---|
| committer | mogorman <mogorman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-08 17:07:41 +0000 |
| commit | dccd6957dc60d588c709fbb7093180a7ac852cc0 (patch) | |
| tree | d834fe7337842a6d3e592217134ea2a2df3e937c /res | |
| parent | 20239ec3e733f155fe4dd6f17affb8e858bcaf15 (diff) | |
some code clean up and catch for a act_hook being called
without a packet.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@39351 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_jabber.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/res/res_jabber.c b/res/res_jabber.c index 48c375cac..65064170e 100644 --- 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); |