Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

adds statusmessage customization from Julian Lyndon-Smith

Browse Source 
and fixes bug with pruneregister


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@31275 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.4
Matt O'Gorman 20 years ago
parent 725e285bc4
commit 8cfb992c1e
3 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File

10
configs/jabber.conf.sample
Unescape View File

@ -7,9 +7,11 @@
;type=client ;;Client or Component connection ;type=client ;;Client or Component connection
;serverhost=astjab.org ;;Route to server for example, ;serverhost=astjab.org ;;Route to server for example,
;; talk.google.com ;; talk.google.com
;username=asterisk@astjab.org/asterisk ;;username with optional roster. ;username=asterisk@astjab.org/asterisk ;;Username with optional roster.
;secret=blah ;;Password ;secret=blah ;;Password
;port=5222 ;;Port to use defaults to 5222 ;port=5222 ;;Port to use defaults to 5222
;usetls=yes ;;use tls or not ;usetls=yes ;;Use tls or not
;usesasl=yes ;;use sasl or not ;usesasl=yes ;;Use sasl or not
;buddy=mogorman@astjab.org ;;manual addition of buddy to list. ;buddy=mogorman@astjab.org ;;Manual addition of buddy to list.
;statusmessage="I am available" ;;Have custom status message for
;;Asterisk.

1
include/asterisk/jabber.h
Unescape View File

@ -93,6 +93,7 @@ struct aji_client {
char user[160]; char user[160];
char serverhost[160]; char serverhost[160];
char context[100]; char context[100];
char statusmessage[256];
char sid[10]; /* Session ID */ char sid[10]; /* Session ID */
char mid[6]; /* Message ID */ char mid[6]; /* Message ID */
iksid *jid; iksid *jid;

22
res/res_jabber.c
Unescape View File

@ -377,14 +377,14 @@ static int aji_send_exec(struct ast_channel *chan, void *data)
{ {
struct aji_client *client = NULL; struct aji_client *client = NULL;
char *s = NULL, *sender = NULL, *recipiant = NULL, *message = NULL; char *s = NULL, *sender = NULL, *recipient = NULL, *message = NULL;
if (data) { if (data) {
s = ast_strdupa((char *) data); s = ast_strdupa((char *) data);
if (s) { if (s) {
sender = strsep(&s, "|"); sender = strsep(&s, "|");
if (sender && (sender[0] != '\0')) { if (sender && (sender[0] != '\0')) {
recipiant = strsep(&s, "|"); recipient = strsep(&s, "|");
if (recipiant && (recipiant[0] != '\0')) { if (recipient && (recipient[0] != '\0')) {
message = s; message = s;
} else { } else {
ast_log(LOG_ERROR, "Bad arguments \n"); ast_log(LOG_ERROR, "Bad arguments \n");
@ -401,8 +401,8 @@ static int aji_send_exec(struct ast_channel *chan, void *data)
ast_log(LOG_ERROR, "Out of memory\n"); ast_log(LOG_ERROR, "Out of memory\n");
return -1; return -1;
} }
if (strchr(recipiant, '@') && message) if (strchr(recipient, '@') && message)
ast_aji_send(client, recipiant, message); ast_aji_send(client, recipient, message);
return 0; return 0;
} }
@ -1019,7 +1019,7 @@ static void aji_handle_presence(struct aji_client *client, ikspak *pak)
buddy = ASTOBJ_CONTAINER_FIND(&client->buddies, pak->from->partial); buddy = ASTOBJ_CONTAINER_FIND(&client->buddies, pak->from->partial);
if (!buddy) { if (!buddy) {
ast_log(LOG_WARNING, "Got presence packet from %s, somone not in our roster!!!!\n", pak->from->partial); ast_log(LOG_WARNING, "Got presence packet from %s, someone not in our roster!!!!\n", pak->from->partial);
return; return;
} }
status = (pak->show) ? pak->show : 6; status = (pak->show) ? pak->show : 6;
@ -1475,6 +1475,8 @@ static void aji_pruneregister(struct aji_client *client)
send = iks_make_iq(IKS_TYPE_GET, "http://jabber.org/protocol/disco#items"); send = iks_make_iq(IKS_TYPE_GET, "http://jabber.org/protocol/disco#items");
if (client && removeiq && removequery && removeitem && send) { if (client && removeiq && removequery && removeitem && send) {
iks_insert_node(removeiq, removequery);
iks_insert_node(removequery, removeitem);
ASTOBJ_CONTAINER_TRAVERSE(&client->buddies, 1, { ASTOBJ_CONTAINER_TRAVERSE(&client->buddies, 1, {
ASTOBJ_RDLOCK(iterator); ASTOBJ_RDLOCK(iterator);
/* For an aji_buddy, both AUTOPRUNE and AUTOREGISTER will never /* For an aji_buddy, both AUTOPRUNE and AUTOREGISTER will never
@ -1491,8 +1493,6 @@ static void aji_pruneregister(struct aji_client *client)
iks_insert_attrib(removequery, "xmlns", "jabber:iq:roster"); iks_insert_attrib(removequery, "xmlns", "jabber:iq:roster");
iks_insert_attrib(removeitem, "jid", iterator->name); iks_insert_attrib(removeitem, "jid", iterator->name);
iks_insert_attrib(removeitem, "subscription", "remove"); iks_insert_attrib(removeitem, "subscription", "remove");
iks_insert_node(removeiq, removequery);
iks_insert_node(removequery, removeitem);
res = iks_send(client->p, removeiq); res = iks_send(client->p, removeiq);
} else if (ast_test_flag(iterator, AJI_AUTOREGISTER)) { } else if (ast_test_flag(iterator, AJI_AUTOREGISTER)) {
if (iterator->btype == AJI_USER) { /*if it is not a transport */ if (iterator->btype == AJI_USER) { /*if it is not a transport */
@ -1639,7 +1639,7 @@ static int aji_get_roster(struct aji_client *client)
roster = iks_make_iq(IKS_TYPE_GET, IKS_NS_ROSTER); roster = iks_make_iq(IKS_TYPE_GET, IKS_NS_ROSTER);
if(roster) { if(roster) {
iks_insert_attrib(roster, "id", "roster"); iks_insert_attrib(roster, "id", "roster");
aji_set_presence(client, client->jid->full, 1, "im available"); aji_set_presence(client, client->jid->full, 1, client->statusmessage);
iks_send(client->p, roster); iks_send(client->p, roster);
} }
if (roster) if (roster)
@ -1920,6 +1920,8 @@ static int aji_create_client(char *label, struct ast_variable *var, int debug)
client->keepalive = 1; client->keepalive = 1;
client->timeout = 20; client->timeout = 20;
client->component = AJI_CLIENT; client->component = AJI_CLIENT;
ast_copy_string(client->statusmessage, "Online and Available", sizeof(client->statusmessage));
if (flag) client->authorized = 0; if (flag) client->authorized = 0;
client->usesasl = 0; client->usesasl = 0;
if (flag) client->state = AJI_DISCONNECTED; if (flag) client->state = AJI_DISCONNECTED;
@ -1930,6 +1932,8 @@ static int aji_create_client(char *label, struct ast_variable *var, int debug)
ast_copy_string(client->serverhost, var->value, sizeof(client->serverhost)); ast_copy_string(client->serverhost, var->value, sizeof(client->serverhost));
else if (!strcasecmp(var->name, "secret")) else if (!strcasecmp(var->name, "secret"))
ast_copy_string(client->password, var->value, sizeof(client->password)); ast_copy_string(client->password, var->value, sizeof(client->password));
else if (!strcasecmp(var->name, "statusmessage"))
ast_copy_string(client->statusmessage, var->value, sizeof(client->statusmessage));
else if (!strcasecmp(var->name, "port")) else if (!strcasecmp(var->name, "port"))
client->port = atoi(var->value); client->port = atoi(var->value);
else if (!strcasecmp(var->name, "debug")) else if (!strcasecmp(var->name, "debug"))

Write Preview
Loading…
Cancel
Save