libpurple/protocols/simple/simple.c

Thu, 15 May 2014 17:30:07 +0200

author
Tomasz Wasilczyk <twasilczyk@pidgin.im>
date
Thu, 15 May 2014 17:30:07 +0200
branch
release-2.x.y
changeset 36041
7f35f441b939
parent 36037
e2ef692ff10a
child 36042
8542cfac74c4
child 38258
9a6551eba09c
permissions
-rw-r--r--

Fix a coverity typo

11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1 /**
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2 * @file simple.c
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
3 *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
4 * purple
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
5 *
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
6 * Copyright (C) 2005 Thomas Butter <butter@uni-mannheim.de>
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
7 *
11345
48a2f93e47b6 [gaim-migrate @ 13562]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11341
diff changeset
8 * ***
48a2f93e47b6 [gaim-migrate @ 13562]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11341
diff changeset
9 * Thanks to Google's Summer of Code Program and the helpful mentors
48a2f93e47b6 [gaim-migrate @ 13562]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11341
diff changeset
10 * ***
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
11 *
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
12 * This program is free software; you can redistribute it and/or modify
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
13 * it under the terms of the GNU General Public License as published by
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
14 * the Free Software Foundation; either version 2 of the License, or
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
15 * (at your option) any later version.
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
16 *
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
17 * This program is distributed in the hope that it will be useful,
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
18 * but WITHOUT ANY WARRANTY; without even the implied warranty of
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
19 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
20 * GNU General Public License for more details.
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
21 *
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
22 * You should have received a copy of the GNU General Public License
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
23 * along with this program; if not, write to the Free Software
19859
71d37b57eff2 The FSF changed its address a while ago; our files were out of date.
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 19848
diff changeset
24 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
25 */
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
26
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
27 #include "internal.h"
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
28
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
29 #include "accountopt.h"
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
30 #include "blist.h"
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
31 #include "conversation.h"
14243
0bda01972ff2 [gaim-migrate @ 16833]
Mark Doliner <markdoliner@pidgin.im>
parents: 14226
diff changeset
32 #include "dnsquery.h"
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
33 #include "debug.h"
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
34 #include "notify.h"
11345
48a2f93e47b6 [gaim-migrate @ 13562]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11341
diff changeset
35 #include "privacy.h"
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
36 #include "prpl.h"
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
37 #include "plugin.h"
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
38 #include "util.h"
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
39 #include "version.h"
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
40 #include "network.h"
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
41 #include "xmlnode.h"
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
42
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
43 #include "simple.h"
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
44 #include "sipmsg.h"
11383
2c5a70e62389 [gaim-migrate @ 13610]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11346
diff changeset
45 #include "dnssrv.h"
11409
2a3466f4a32c [gaim-migrate @ 13646]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11396
diff changeset
46 #include "ntlm.h"
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
47
22104
56970903b8e9 Probe for -Wstrict-prototypes to get some more warnings. I then cleaned up
Richard Laager <rlaager@pidgin.im>
parents: 21503
diff changeset
48 static char *gentag(void) {
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
49 return g_strdup_printf("%04d%04d", rand() & 0xFFFF, rand() & 0xFFFF);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
50 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
51
22104
56970903b8e9 Probe for -Wstrict-prototypes to get some more warnings. I then cleaned up
Richard Laager <rlaager@pidgin.im>
parents: 21503
diff changeset
52 static char *genbranch(void) {
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
53 return g_strdup_printf("z9hG4bK%04X%04X%04X%04X%04X",
12767
4870d7755883 [gaim-migrate @ 15114]
Daniel Atallah <datallah@pidgin.im>
parents: 12760
diff changeset
54 rand() & 0xFFFF, rand() & 0xFFFF, rand() & 0xFFFF,
4870d7755883 [gaim-migrate @ 15114]
Daniel Atallah <datallah@pidgin.im>
parents: 12760
diff changeset
55 rand() & 0xFFFF, rand() & 0xFFFF);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
56 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
57
22104
56970903b8e9 Probe for -Wstrict-prototypes to get some more warnings. I then cleaned up
Richard Laager <rlaager@pidgin.im>
parents: 21503
diff changeset
58 static char *gencallid(void) {
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
59 return g_strdup_printf("%04Xg%04Xa%04Xi%04Xm%04Xt%04Xb%04Xx%04Xx",
12767
4870d7755883 [gaim-migrate @ 15114]
Daniel Atallah <datallah@pidgin.im>
parents: 12760
diff changeset
60 rand() & 0xFFFF, rand() & 0xFFFF, rand() & 0xFFFF,
4870d7755883 [gaim-migrate @ 15114]
Daniel Atallah <datallah@pidgin.im>
parents: 12760
diff changeset
61 rand() & 0xFFFF, rand() & 0xFFFF, rand() & 0xFFFF,
4870d7755883 [gaim-migrate @ 15114]
Daniel Atallah <datallah@pidgin.im>
parents: 12760
diff changeset
62 rand() & 0xFFFF, rand() & 0xFFFF);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
63 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
64
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
65 static const char *simple_list_icon(PurpleAccount *a, PurpleBuddy *b) {
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
66 return "simple";
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
67 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
68
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
69 static void simple_keep_alive(PurpleConnection *gc) {
11194
47dc0e9a757a [gaim-migrate @ 13317]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11192
diff changeset
70 struct simple_account_data *sip = gc->proto_data;
11341
5511bbeeb3b4 [gaim-migrate @ 13555]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11327
diff changeset
71 if(sip->udp) { /* in case of UDP send a packet only with a 0 byte to
5511bbeeb3b4 [gaim-migrate @ 13555]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11327
diff changeset
72 remain in the NAT table */
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
73 gchar buf[2] = {0, 0};
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
74 purple_debug_info("simple", "sending keep alive\n");
35991
e6937e52930b Fix some CWE-252 coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35221
diff changeset
75 if (sendto(sip->fd, buf, 1, 0,
e6937e52930b Fix some CWE-252 coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35221
diff changeset
76 (struct sockaddr*)&sip->serveraddr,
e6937e52930b Fix some CWE-252 coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35221
diff changeset
77 sizeof(struct sockaddr_in)) != 1)
e6937e52930b Fix some CWE-252 coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35221
diff changeset
78 {
e6937e52930b Fix some CWE-252 coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35221
diff changeset
79 purple_debug_error("simple", "failed sending keep alive\n");
e6937e52930b Fix some CWE-252 coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35221
diff changeset
80 }
11194
47dc0e9a757a [gaim-migrate @ 13317]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11192
diff changeset
81 }
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
82 return;
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
83 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
84
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
85 static gboolean process_register_response(struct simple_account_data *sip, struct sipmsg *msg, struct transaction *tc);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
86 static void send_notify(struct simple_account_data *sip, struct simple_watcher *);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
87
20988
75eab0f2aa19 Patch from Will Hawkins to publish a status of closed when signing out of a SIMPLE account. Fixes #1914.
Daniel Atallah <datallah@pidgin.im>
parents: 20658
diff changeset
88 static void send_open_publish(struct simple_account_data *sip);
75eab0f2aa19 Patch from Will Hawkins to publish a status of closed when signing out of a SIMPLE account. Fixes #1914.
Daniel Atallah <datallah@pidgin.im>
parents: 20658
diff changeset
89 static void send_closed_publish(struct simple_account_data *sip);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
90
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
91 static void do_notifies(struct simple_account_data *sip) {
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
92 GSList *tmp = sip->watcher;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
93 purple_debug_info("simple", "do_notifies()\n");
11345
48a2f93e47b6 [gaim-migrate @ 13562]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11341
diff changeset
94 if((sip->republish != -1) || sip->republish < time(NULL)) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
95 if(purple_account_get_bool(sip->account, "dopublish", TRUE)) {
20988
75eab0f2aa19 Patch from Will Hawkins to publish a status of closed when signing out of a SIMPLE account. Fixes #1914.
Daniel Atallah <datallah@pidgin.im>
parents: 20658
diff changeset
96 send_open_publish(sip);
11345
48a2f93e47b6 [gaim-migrate @ 13562]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11341
diff changeset
97 }
48a2f93e47b6 [gaim-migrate @ 13562]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11341
diff changeset
98 }
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
99
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
100 while(tmp) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
101 purple_debug_info("simple", "notifying %s\n", ((struct simple_watcher*)tmp->data)->name);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
102 send_notify(sip, tmp->data);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
103 tmp = tmp->next;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
104 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
105 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
106
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
107 static void simple_set_status(PurpleAccount *account, PurpleStatus *status) {
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
108 PurpleStatusPrimitive primitive = purple_status_type_get_primitive(purple_status_get_type(status));
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
109 struct simple_account_data *sip = NULL;
11718
90804d019837 [gaim-migrate @ 14009]
Mark Doliner <markdoliner@pidgin.im>
parents: 11658
diff changeset
110
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
111 if (!purple_status_is_active(status))
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
112 return;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
113
11718
90804d019837 [gaim-migrate @ 14009]
Mark Doliner <markdoliner@pidgin.im>
parents: 11658
diff changeset
114 if (account->gc)
90804d019837 [gaim-migrate @ 14009]
Mark Doliner <markdoliner@pidgin.im>
parents: 11658
diff changeset
115 sip = account->gc->proto_data;
90804d019837 [gaim-migrate @ 14009]
Mark Doliner <markdoliner@pidgin.im>
parents: 11658
diff changeset
116
90804d019837 [gaim-migrate @ 14009]
Mark Doliner <markdoliner@pidgin.im>
parents: 11658
diff changeset
117 if (sip)
90804d019837 [gaim-migrate @ 14009]
Mark Doliner <markdoliner@pidgin.im>
parents: 11658
diff changeset
118 {
11650
757d7fbd4ca9 [gaim-migrate @ 13931]
Mark Doliner <markdoliner@pidgin.im>
parents: 11522
diff changeset
119 g_free(sip->status);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
120 if (primitive == PURPLE_STATUS_AVAILABLE)
11718
90804d019837 [gaim-migrate @ 14009]
Mark Doliner <markdoliner@pidgin.im>
parents: 11658
diff changeset
121 sip->status = g_strdup("available");
90804d019837 [gaim-migrate @ 14009]
Mark Doliner <markdoliner@pidgin.im>
parents: 11658
diff changeset
122 else
90804d019837 [gaim-migrate @ 14009]
Mark Doliner <markdoliner@pidgin.im>
parents: 11658
diff changeset
123 sip->status = g_strdup("busy");
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
124
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
125 do_notifies(sip);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
126 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
127 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
128
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
129 static struct sip_connection *connection_find(struct simple_account_data *sip, int fd) {
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
130 struct sip_connection *ret = NULL;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
131 GSList *entry = sip->openconns;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
132 while(entry) {
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
133 ret = entry->data;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
134 if(ret->fd == fd) return ret;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
135 entry = entry->next;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
136 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
137 return NULL;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
138 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
139
14131
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
140 static struct simple_watcher *watcher_find(struct simple_account_data *sip,
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
141 const gchar *name) {
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
142 struct simple_watcher *watcher;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
143 GSList *entry = sip->watcher;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
144 while(entry) {
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
145 watcher = entry->data;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
146 if(!strcmp(name, watcher->name)) return watcher;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
147 entry = entry->next;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
148 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
149 return NULL;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
150 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
151
14131
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
152 static struct simple_watcher *watcher_create(struct simple_account_data *sip,
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
153 const gchar *name, const gchar *callid, const gchar *ourtag,
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
154 const gchar *theirtag, gboolean needsxpidf) {
13093
e27434c31f00 [gaim-migrate @ 15454]
Daniel Atallah <datallah@pidgin.im>
parents: 13089
diff changeset
155 struct simple_watcher *watcher = g_new0(struct simple_watcher, 1);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
156 watcher->name = g_strdup(name);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
157 watcher->dialog.callid = g_strdup(callid);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
158 watcher->dialog.ourtag = g_strdup(ourtag);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
159 watcher->dialog.theirtag = g_strdup(theirtag);
13178
824d50326672 [gaim-migrate @ 15540]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13130
diff changeset
160 watcher->needsxpidf = needsxpidf;
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
161 sip->watcher = g_slist_append(sip->watcher, watcher);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
162 return watcher;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
163 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
164
14131
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
165 static void watcher_remove(struct simple_account_data *sip, const gchar *name) {
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
166 struct simple_watcher *watcher = watcher_find(sip, name);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
167 sip->watcher = g_slist_remove(sip->watcher, watcher);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
168 g_free(watcher->name);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
169 g_free(watcher->dialog.callid);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
170 g_free(watcher->dialog.ourtag);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
171 g_free(watcher->dialog.theirtag);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
172 g_free(watcher);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
173 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
174
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
175 static struct sip_connection *connection_create(struct simple_account_data *sip, int fd) {
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
176 struct sip_connection *ret = g_new0(struct sip_connection, 1);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
177 ret->fd = fd;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
178 sip->openconns = g_slist_append(sip->openconns, ret);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
179 return ret;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
180 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
182 static void connection_remove(struct simple_account_data *sip, int fd) {
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
183 struct sip_connection *conn = connection_find(sip, fd);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
184 sip->openconns = g_slist_remove(sip->openconns, conn);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
185 if(conn->inputhandler) purple_input_remove(conn->inputhandler);
11650
757d7fbd4ca9 [gaim-migrate @ 13931]
Mark Doliner <markdoliner@pidgin.im>
parents: 11522
diff changeset
186 g_free(conn->inbuf);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
187 g_free(conn);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
188 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
189
11346
4af1dc4b2c44 [gaim-migrate @ 13563]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11345
diff changeset
190 static void connection_free_all(struct simple_account_data *sip) {
4af1dc4b2c44 [gaim-migrate @ 13563]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11345
diff changeset
191 struct sip_connection *ret = NULL;
4af1dc4b2c44 [gaim-migrate @ 13563]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11345
diff changeset
192 GSList *entry = sip->openconns;
4af1dc4b2c44 [gaim-migrate @ 13563]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11345
diff changeset
193 while(entry) {
4af1dc4b2c44 [gaim-migrate @ 13563]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11345
diff changeset
194 ret = entry->data;
4af1dc4b2c44 [gaim-migrate @ 13563]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11345
diff changeset
195 connection_remove(sip, ret->fd);
4af1dc4b2c44 [gaim-migrate @ 13563]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11345
diff changeset
196 entry = sip->openconns;
4af1dc4b2c44 [gaim-migrate @ 13563]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11345
diff changeset
197 }
4af1dc4b2c44 [gaim-migrate @ 13563]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11345
diff changeset
198 }
4af1dc4b2c44 [gaim-migrate @ 13563]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11345
diff changeset
199
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
200 static void simple_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group)
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
201 {
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
202 struct simple_account_data *sip = (struct simple_account_data *)gc->proto_data;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
203 struct simple_buddy *b;
24398
4865c2ee6ea8 Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 24040
diff changeset
204 const char *name = purple_buddy_get_name(buddy);
25911
f22097dc8413 propagate from branch 'im.pidgin.pidgin.next.minor' (head d24c4a9d28f21eaa47bd76e50ed31053733edcb1)
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25865 25603
diff changeset
205 if(strncmp(name, "sip:", 4)) {
24398
4865c2ee6ea8 Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 24040
diff changeset
206 gchar *buf = g_strdup_printf("sip:%s", name);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
207 purple_blist_rename_buddy(buddy, buf);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
208 g_free(buf);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
209 }
24398
4865c2ee6ea8 Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 24040
diff changeset
210 if(!g_hash_table_lookup(sip->buddies, name)) {
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
211 b = g_new0(struct simple_buddy, 1);
24398
4865c2ee6ea8 Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 24040
diff changeset
212 purple_debug_info("simple", "simple_add_buddy %s\n", name);
4865c2ee6ea8 Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 24040
diff changeset
213 b->name = g_strdup(name);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
214 g_hash_table_insert(sip->buddies, b->name, b);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
215 } else {
24398
4865c2ee6ea8 Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 24040
diff changeset
216 purple_debug_info("simple", "buddy %s already in internal list\n", name);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
217 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
218 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
219
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
220 static void simple_get_buddies(PurpleConnection *gc) {
27199
ab2af9d15cba Use purple_find_buddies() instead of iterating the buddy list.
Paul Aurich <darkrain42@pidgin.im>
parents: 26482
diff changeset
221 GSList *buddies;
24398
4865c2ee6ea8 Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 24040
diff changeset
222 PurpleAccount *account;
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
223
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
224 purple_debug_info("simple", "simple_get_buddies\n");
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
225
24398
4865c2ee6ea8 Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 24040
diff changeset
226 account = purple_connection_get_account(gc);
27199
ab2af9d15cba Use purple_find_buddies() instead of iterating the buddy list.
Paul Aurich <darkrain42@pidgin.im>
parents: 26482
diff changeset
227 buddies = purple_find_buddies(account, NULL);
ab2af9d15cba Use purple_find_buddies() instead of iterating the buddy list.
Paul Aurich <darkrain42@pidgin.im>
parents: 26482
diff changeset
228 while (buddies) {
ab2af9d15cba Use purple_find_buddies() instead of iterating the buddy list.
Paul Aurich <darkrain42@pidgin.im>
parents: 26482
diff changeset
229 PurpleBuddy *buddy = buddies->data;
ab2af9d15cba Use purple_find_buddies() instead of iterating the buddy list.
Paul Aurich <darkrain42@pidgin.im>
parents: 26482
diff changeset
230 simple_add_buddy(gc, buddy, purple_buddy_get_group(buddy));
ab2af9d15cba Use purple_find_buddies() instead of iterating the buddy list.
Paul Aurich <darkrain42@pidgin.im>
parents: 26482
diff changeset
231
ab2af9d15cba Use purple_find_buddies() instead of iterating the buddy list.
Paul Aurich <darkrain42@pidgin.im>
parents: 26482
diff changeset
232 buddies = g_slist_delete_link(buddies, buddies);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
233 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
234 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
235
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
236 static void simple_remove_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group)
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
237 {
24398
4865c2ee6ea8 Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 24040
diff changeset
238 const char *name = purple_buddy_get_name(buddy);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
239 struct simple_account_data *sip = (struct simple_account_data *)gc->proto_data;
24398
4865c2ee6ea8 Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 24040
diff changeset
240 struct simple_buddy *b = g_hash_table_lookup(sip->buddies, name);
4865c2ee6ea8 Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 24040
diff changeset
241 g_hash_table_remove(sip->buddies, name);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
242 g_free(b->name);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
243 g_free(b);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
244 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
245
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
246 static GList *simple_status_types(PurpleAccount *acc) {
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
247 PurpleStatusType *type;
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
248 GList *types = NULL;
12456
94b229fc8203 [gaim-migrate @ 14765]
Mark Doliner <markdoliner@pidgin.im>
parents: 12389
diff changeset
249
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
250 type = purple_status_type_new_with_attrs(
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
251 PURPLE_STATUS_AVAILABLE, NULL, NULL, TRUE, TRUE, FALSE,
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
252 "message", _("Message"), purple_value_new(PURPLE_TYPE_STRING),
12595
8108c22aa723 [gaim-migrate @ 14925]
Richard Laager <rlaager@pidgin.im>
parents: 12571
diff changeset
253 NULL);
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
254 types = g_list_append(types, type);
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
255
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
256 type = purple_status_type_new_full(
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
257 PURPLE_STATUS_OFFLINE, NULL, NULL, TRUE, TRUE, FALSE);
12657
fd16423a0383 [gaim-migrate @ 15000]
Mark Doliner <markdoliner@pidgin.im>
parents: 12645
diff changeset
258 types = g_list_append(types, type);
fd16423a0383 [gaim-migrate @ 15000]
Mark Doliner <markdoliner@pidgin.im>
parents: 12645
diff changeset
259
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
260 return types;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
261 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
262
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
263 static gchar *auth_header(struct simple_account_data *sip,
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
264 struct sip_auth *auth, const gchar *method, const gchar *target) {
11346
4af1dc4b2c44 [gaim-migrate @ 13563]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11345
diff changeset
265 gchar noncecount[9];
12382
5ef67596b420 [gaim-migrate @ 14688]
Richard Laager <rlaager@pidgin.im>
parents: 12216
diff changeset
266 gchar *response;
11346
4af1dc4b2c44 [gaim-migrate @ 13563]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11345
diff changeset
267 gchar *ret;
11409
2a3466f4a32c [gaim-migrate @ 13646]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11396
diff changeset
268 gchar *tmp;
13089
e1ab8bfba211 [gaim-migrate @ 15450]
Mark Doliner <markdoliner@pidgin.im>
parents: 13086
diff changeset
269 const char *authdomain;
e1ab8bfba211 [gaim-migrate @ 15450]
Mark Doliner <markdoliner@pidgin.im>
parents: 13086
diff changeset
270 const char *authuser;
e1ab8bfba211 [gaim-migrate @ 15450]
Mark Doliner <markdoliner@pidgin.im>
parents: 13086
diff changeset
271
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
272 authdomain = purple_account_get_string(sip->account, "authdomain", "");
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
273 authuser = purple_account_get_string(sip->account, "authuser", sip->username);
13089
e1ab8bfba211 [gaim-migrate @ 15450]
Mark Doliner <markdoliner@pidgin.im>
parents: 13086
diff changeset
274
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
275 if(!authuser || strlen(authuser) < 1) {
13085
c80913901342 [gaim-migrate @ 15446]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13084
diff changeset
276 authuser = sip->username;
c80913901342 [gaim-migrate @ 15446]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13084
diff changeset
277 }
11409
2a3466f4a32c [gaim-migrate @ 13646]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11396
diff changeset
278
2a3466f4a32c [gaim-migrate @ 13646]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11396
diff changeset
279 if(auth->type == 1) { /* Digest */
2a3466f4a32c [gaim-migrate @ 13646]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11396
diff changeset
280 sprintf(noncecount, "%08d", auth->nc++);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
281 response = purple_cipher_http_digest_calculate_response(
12389
7196ba664097 [gaim-migrate @ 14695]
Richard Laager <rlaager@pidgin.im>
parents: 12382
diff changeset
282 "md5", method, target, NULL, NULL,
12382
5ef67596b420 [gaim-migrate @ 14688]
Richard Laager <rlaager@pidgin.im>
parents: 12216
diff changeset
283 auth->nonce, noncecount, NULL, auth->digest_session_key);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
284 purple_debug(PURPLE_DEBUG_MISC, "simple", "response %s\n", response);
12382
5ef67596b420 [gaim-migrate @ 14688]
Richard Laager <rlaager@pidgin.im>
parents: 12216
diff changeset
285
17187
78b7ae95ad45 Fix an extra \r\n in the Authorization header. Fixes #965.
Daniel Atallah <datallah@pidgin.im>
parents: 17185
diff changeset
286 ret = g_strdup_printf("Digest username=\"%s\", realm=\"%s\", nonce=\"%s\", uri=\"%s\", nc=\"%s\", response=\"%s\"", authuser, auth->realm, auth->nonce, target, noncecount, response);
12382
5ef67596b420 [gaim-migrate @ 14688]
Richard Laager <rlaager@pidgin.im>
parents: 12216
diff changeset
287 g_free(response);
11409
2a3466f4a32c [gaim-migrate @ 13646]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11396
diff changeset
288 return ret;
2a3466f4a32c [gaim-migrate @ 13646]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11396
diff changeset
289 } else if(auth->type == 2) { /* NTLM */
13085
c80913901342 [gaim-migrate @ 15446]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13084
diff changeset
290 if(auth->nc == 3 && auth->nonce) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
291 /* TODO: Don't hardcode "purple" as the hostname */
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
292 ret = purple_ntlm_gen_type3(authuser, sip->password, "purple", authdomain, (const guint8 *)auth->nonce, &auth->flags);
17187
78b7ae95ad45 Fix an extra \r\n in the Authorization header. Fixes #965.
Daniel Atallah <datallah@pidgin.im>
parents: 17185
diff changeset
293 tmp = g_strdup_printf("NTLM qop=\"auth\", opaque=\"%s\", realm=\"%s\", targetname=\"%s\", gssapi-data=\"%s\"", auth->opaque, auth->realm, auth->target, ret);
11409
2a3466f4a32c [gaim-migrate @ 13646]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11396
diff changeset
294 g_free(ret);
2a3466f4a32c [gaim-migrate @ 13646]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11396
diff changeset
295 return tmp;
2a3466f4a32c [gaim-migrate @ 13646]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11396
diff changeset
296 }
17187
78b7ae95ad45 Fix an extra \r\n in the Authorization header. Fixes #965.
Daniel Atallah <datallah@pidgin.im>
parents: 17185
diff changeset
297 tmp = g_strdup_printf("NTLM qop=\"auth\", realm=\"%s\", targetname=\"%s\", gssapi-data=\"\"", auth->realm, auth->target);
11409
2a3466f4a32c [gaim-migrate @ 13646]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11396
diff changeset
298 return tmp;
2a3466f4a32c [gaim-migrate @ 13646]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11396
diff changeset
299 }
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
300
11346
4af1dc4b2c44 [gaim-migrate @ 13563]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11345
diff changeset
301 sprintf(noncecount, "%08d", auth->nc++);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
302 response = purple_cipher_http_digest_calculate_response(
12389
7196ba664097 [gaim-migrate @ 14695]
Richard Laager <rlaager@pidgin.im>
parents: 12382
diff changeset
303 "md5", method, target, NULL, NULL,
12382
5ef67596b420 [gaim-migrate @ 14688]
Richard Laager <rlaager@pidgin.im>
parents: 12216
diff changeset
304 auth->nonce, noncecount, NULL, auth->digest_session_key);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
305 purple_debug(PURPLE_DEBUG_MISC, "simple", "response %s\n", response);
12382
5ef67596b420 [gaim-migrate @ 14688]
Richard Laager <rlaager@pidgin.im>
parents: 12216
diff changeset
306
17187
78b7ae95ad45 Fix an extra \r\n in the Authorization header. Fixes #965.
Daniel Atallah <datallah@pidgin.im>
parents: 17185
diff changeset
307 ret = g_strdup_printf("Digest username=\"%s\", realm=\"%s\", nonce=\"%s\", uri=\"%s\", nc=\"%s\", response=\"%s\"", authuser, auth->realm, auth->nonce, target, noncecount, response);
12382
5ef67596b420 [gaim-migrate @ 14688]
Richard Laager <rlaager@pidgin.im>
parents: 12216
diff changeset
308 g_free(response);
11346
4af1dc4b2c44 [gaim-migrate @ 13563]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11345
diff changeset
309 return ret;
4af1dc4b2c44 [gaim-migrate @ 13563]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11345
diff changeset
310 }
4af1dc4b2c44 [gaim-migrate @ 13563]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11345
diff changeset
311
14131
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
312 static char *parse_attribute(const char *attrname, const char *source) {
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
313 const char *tmp, *tmp2;
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
314 char *retval = NULL;
12746
7ee4a8a55435 [gaim-migrate @ 15093]
Daniel Atallah <datallah@pidgin.im>
parents: 12745
diff changeset
315 int len = strlen(attrname);
7ee4a8a55435 [gaim-migrate @ 15093]
Daniel Atallah <datallah@pidgin.im>
parents: 12745
diff changeset
316
23086
413ccc075f8b Patch from Will Hawkins to fix SIMPLE authentication on some servers.
Daniel Atallah <datallah@pidgin.im>
parents: 22942
diff changeset
317 /* we know that source is NULL-terminated.
413ccc075f8b Patch from Will Hawkins to fix SIMPLE authentication on some servers.
Daniel Atallah <datallah@pidgin.im>
parents: 22942
diff changeset
318 * Therefore this loop won't be infinite.
413ccc075f8b Patch from Will Hawkins to fix SIMPLE authentication on some servers.
Daniel Atallah <datallah@pidgin.im>
parents: 22942
diff changeset
319 */
413ccc075f8b Patch from Will Hawkins to fix SIMPLE authentication on some servers.
Daniel Atallah <datallah@pidgin.im>
parents: 22942
diff changeset
320 while (source[0] == ' ')
413ccc075f8b Patch from Will Hawkins to fix SIMPLE authentication on some servers.
Daniel Atallah <datallah@pidgin.im>
parents: 22942
diff changeset
321 source++;
413ccc075f8b Patch from Will Hawkins to fix SIMPLE authentication on some servers.
Daniel Atallah <datallah@pidgin.im>
parents: 22942
diff changeset
322
12746
7ee4a8a55435 [gaim-migrate @ 15093]
Daniel Atallah <datallah@pidgin.im>
parents: 12745
diff changeset
323 if(!strncmp(source, attrname, len)) {
7ee4a8a55435 [gaim-migrate @ 15093]
Daniel Atallah <datallah@pidgin.im>
parents: 12745
diff changeset
324 tmp = source + len;
7ee4a8a55435 [gaim-migrate @ 15093]
Daniel Atallah <datallah@pidgin.im>
parents: 12745
diff changeset
325 tmp2 = g_strstr_len(tmp, strlen(tmp), "\"");
7ee4a8a55435 [gaim-migrate @ 15093]
Daniel Atallah <datallah@pidgin.im>
parents: 12745
diff changeset
326 if(tmp2)
7ee4a8a55435 [gaim-migrate @ 15093]
Daniel Atallah <datallah@pidgin.im>
parents: 12745
diff changeset
327 retval = g_strndup(tmp, tmp2 - tmp);
13086
0e5a0a33475b [gaim-migrate @ 15447]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13085
diff changeset
328 else
0e5a0a33475b [gaim-migrate @ 15447]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13085
diff changeset
329 retval = g_strdup(tmp);
12746
7ee4a8a55435 [gaim-migrate @ 15093]
Daniel Atallah <datallah@pidgin.im>
parents: 12745
diff changeset
330 }
7ee4a8a55435 [gaim-migrate @ 15093]
Daniel Atallah <datallah@pidgin.im>
parents: 12745
diff changeset
331
7ee4a8a55435 [gaim-migrate @ 15093]
Daniel Atallah <datallah@pidgin.im>
parents: 12745
diff changeset
332 return retval;
7ee4a8a55435 [gaim-migrate @ 15093]
Daniel Atallah <datallah@pidgin.im>
parents: 12745
diff changeset
333 }
7ee4a8a55435 [gaim-migrate @ 15093]
Daniel Atallah <datallah@pidgin.im>
parents: 12745
diff changeset
334
21100
814637ced463 Some constification, which also found and fixed some potential double-free
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21076
diff changeset
335 static void fill_auth(struct simple_account_data *sip, const gchar *hdr, struct sip_auth *auth) {
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
336 int i = 0;
13089
e1ab8bfba211 [gaim-migrate @ 15450]
Mark Doliner <markdoliner@pidgin.im>
parents: 13086
diff changeset
337 const char *authuser;
11424
b0f8535daa74 [gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11409
diff changeset
338 char *tmp;
11439
e76bc2f9deb0 [gaim-migrate @ 13676]
Daniel Atallah <datallah@pidgin.im>
parents: 11424
diff changeset
339 gchar **parts;
13085
c80913901342 [gaim-migrate @ 15446]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13084
diff changeset
340
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
341 authuser = purple_account_get_string(sip->account, "authuser", sip->username);
13089
e1ab8bfba211 [gaim-migrate @ 15450]
Mark Doliner <markdoliner@pidgin.im>
parents: 13086
diff changeset
342
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
343 if(!authuser || strlen(authuser) < 1) {
13085
c80913901342 [gaim-migrate @ 15446]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13084
diff changeset
344 authuser = sip->username;
c80913901342 [gaim-migrate @ 15446]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13084
diff changeset
345 }
13089
e1ab8bfba211 [gaim-migrate @ 15450]
Mark Doliner <markdoliner@pidgin.im>
parents: 13086
diff changeset
346
11346
4af1dc4b2c44 [gaim-migrate @ 13563]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11345
diff changeset
347 if(!hdr) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
348 purple_debug_error("simple", "fill_auth: hdr==NULL\n");
11346
4af1dc4b2c44 [gaim-migrate @ 13563]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11345
diff changeset
349 return;
4af1dc4b2c44 [gaim-migrate @ 13563]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11345
diff changeset
350 }
11409
2a3466f4a32c [gaim-migrate @ 13646]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11396
diff changeset
351
18552
810a338ef085 Use the glib strcasecmp functions everywhere, as we've had reports of
Richard Laager <rlaager@pidgin.im>
parents: 17653
diff changeset
352 if(!g_ascii_strncasecmp(hdr, "NTLM", 4)) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
353 purple_debug_info("simple", "found NTLM\n");
11409
2a3466f4a32c [gaim-migrate @ 13646]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11396
diff changeset
354 auth->type = 2;
23086
413ccc075f8b Patch from Will Hawkins to fix SIMPLE authentication on some servers.
Daniel Atallah <datallah@pidgin.im>
parents: 22942
diff changeset
355 parts = g_strsplit(hdr+5, "\",", 0);
13348
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
356 i = 0;
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
357 while(parts[i]) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
358 purple_debug_info("simple", "parts[i] %s\n", parts[i]);
13348
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
359 if((tmp = parse_attribute("gssapi-data=\"", parts[i]))) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
360 auth->nonce = g_memdup(purple_ntlm_parse_type2(tmp, &auth->flags), 8);
13348
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
361 g_free(tmp);
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
362 }
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
363 if((tmp = parse_attribute("targetname=\"",
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
364 parts[i]))) {
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
365 auth->target = tmp;
11424
b0f8535daa74 [gaim-migrate @ 13661]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11409
diff changeset
366 }
13348
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
367 else if((tmp = parse_attribute("realm=\"",
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
368 parts[i]))) {
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
369 auth->realm = tmp;
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
370 }
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
371 else if((tmp = parse_attribute("opaque=\"", parts[i]))) {
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
372 auth->opaque = tmp;
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
373 }
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
374 i++;
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
375 }
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
376 g_strfreev(parts);
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
377 auth->nc = 1;
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
378 if(!strstr(hdr, "gssapi-data")) {
11409
2a3466f4a32c [gaim-migrate @ 13646]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11396
diff changeset
379 auth->nc = 1;
13085
c80913901342 [gaim-migrate @ 15446]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13084
diff changeset
380 } else {
11409
2a3466f4a32c [gaim-migrate @ 13646]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11396
diff changeset
381 auth->nc = 3;
23086
413ccc075f8b Patch from Will Hawkins to fix SIMPLE authentication on some servers.
Daniel Atallah <datallah@pidgin.im>
parents: 22942
diff changeset
382 }
413ccc075f8b Patch from Will Hawkins to fix SIMPLE authentication on some servers.
Daniel Atallah <datallah@pidgin.im>
parents: 22942
diff changeset
383
11409
2a3466f4a32c [gaim-migrate @ 13646]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11396
diff changeset
384 return;
23086
413ccc075f8b Patch from Will Hawkins to fix SIMPLE authentication on some servers.
Daniel Atallah <datallah@pidgin.im>
parents: 22942
diff changeset
385 } else if(!g_ascii_strncasecmp(hdr, "DIGEST", 6)) {
413ccc075f8b Patch from Will Hawkins to fix SIMPLE authentication on some servers.
Daniel Atallah <datallah@pidgin.im>
parents: 22942
diff changeset
386
413ccc075f8b Patch from Will Hawkins to fix SIMPLE authentication on some servers.
Daniel Atallah <datallah@pidgin.im>
parents: 22942
diff changeset
387 purple_debug_info("simple", "found DIGEST\n");
413ccc075f8b Patch from Will Hawkins to fix SIMPLE authentication on some servers.
Daniel Atallah <datallah@pidgin.im>
parents: 22942
diff changeset
388
413ccc075f8b Patch from Will Hawkins to fix SIMPLE authentication on some servers.
Daniel Atallah <datallah@pidgin.im>
parents: 22942
diff changeset
389 auth->type = 1;
413ccc075f8b Patch from Will Hawkins to fix SIMPLE authentication on some servers.
Daniel Atallah <datallah@pidgin.im>
parents: 22942
diff changeset
390 parts = g_strsplit(hdr+7, ",", 0);
413ccc075f8b Patch from Will Hawkins to fix SIMPLE authentication on some servers.
Daniel Atallah <datallah@pidgin.im>
parents: 22942
diff changeset
391 while(parts[i]) {
413ccc075f8b Patch from Will Hawkins to fix SIMPLE authentication on some servers.
Daniel Atallah <datallah@pidgin.im>
parents: 22942
diff changeset
392 if((tmp = parse_attribute("nonce=\"", parts[i]))) {
413ccc075f8b Patch from Will Hawkins to fix SIMPLE authentication on some servers.
Daniel Atallah <datallah@pidgin.im>
parents: 22942
diff changeset
393 auth->nonce = tmp;
413ccc075f8b Patch from Will Hawkins to fix SIMPLE authentication on some servers.
Daniel Atallah <datallah@pidgin.im>
parents: 22942
diff changeset
394 }
413ccc075f8b Patch from Will Hawkins to fix SIMPLE authentication on some servers.
Daniel Atallah <datallah@pidgin.im>
parents: 22942
diff changeset
395 else if((tmp = parse_attribute("realm=\"", parts[i]))) {
413ccc075f8b Patch from Will Hawkins to fix SIMPLE authentication on some servers.
Daniel Atallah <datallah@pidgin.im>
parents: 22942
diff changeset
396 auth->realm = tmp;
413ccc075f8b Patch from Will Hawkins to fix SIMPLE authentication on some servers.
Daniel Atallah <datallah@pidgin.im>
parents: 22942
diff changeset
397 }
413ccc075f8b Patch from Will Hawkins to fix SIMPLE authentication on some servers.
Daniel Atallah <datallah@pidgin.im>
parents: 22942
diff changeset
398 i++;
413ccc075f8b Patch from Will Hawkins to fix SIMPLE authentication on some servers.
Daniel Atallah <datallah@pidgin.im>
parents: 22942
diff changeset
399 }
413ccc075f8b Patch from Will Hawkins to fix SIMPLE authentication on some servers.
Daniel Atallah <datallah@pidgin.im>
parents: 22942
diff changeset
400 g_strfreev(parts);
413ccc075f8b Patch from Will Hawkins to fix SIMPLE authentication on some servers.
Daniel Atallah <datallah@pidgin.im>
parents: 22942
diff changeset
401 purple_debug(PURPLE_DEBUG_MISC, "simple", "nonce: %s realm: %s\n",
413ccc075f8b Patch from Will Hawkins to fix SIMPLE authentication on some servers.
Daniel Atallah <datallah@pidgin.im>
parents: 22942
diff changeset
402 auth->nonce ? auth->nonce : "(null)",
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 30138
diff changeset
403 auth->realm ? auth->realm : "(null)");
23086
413ccc075f8b Patch from Will Hawkins to fix SIMPLE authentication on some servers.
Daniel Atallah <datallah@pidgin.im>
parents: 22942
diff changeset
404
413ccc075f8b Patch from Will Hawkins to fix SIMPLE authentication on some servers.
Daniel Atallah <datallah@pidgin.im>
parents: 22942
diff changeset
405 if(auth->realm) {
413ccc075f8b Patch from Will Hawkins to fix SIMPLE authentication on some servers.
Daniel Atallah <datallah@pidgin.im>
parents: 22942
diff changeset
406 auth->digest_session_key = purple_cipher_http_digest_calculate_session_key(
413ccc075f8b Patch from Will Hawkins to fix SIMPLE authentication on some servers.
Daniel Atallah <datallah@pidgin.im>
parents: 22942
diff changeset
407 "md5", authuser, auth->realm, sip->password, auth->nonce, NULL);
413ccc075f8b Patch from Will Hawkins to fix SIMPLE authentication on some servers.
Daniel Atallah <datallah@pidgin.im>
parents: 22942
diff changeset
408
413ccc075f8b Patch from Will Hawkins to fix SIMPLE authentication on some servers.
Daniel Atallah <datallah@pidgin.im>
parents: 22942
diff changeset
409 auth->nc = 1;
413ccc075f8b Patch from Will Hawkins to fix SIMPLE authentication on some servers.
Daniel Atallah <datallah@pidgin.im>
parents: 22942
diff changeset
410 }
413ccc075f8b Patch from Will Hawkins to fix SIMPLE authentication on some servers.
Daniel Atallah <datallah@pidgin.im>
parents: 22942
diff changeset
411
413ccc075f8b Patch from Will Hawkins to fix SIMPLE authentication on some servers.
Daniel Atallah <datallah@pidgin.im>
parents: 22942
diff changeset
412 } else {
413ccc075f8b Patch from Will Hawkins to fix SIMPLE authentication on some servers.
Daniel Atallah <datallah@pidgin.im>
parents: 22942
diff changeset
413 purple_debug_error("simple", "Unsupported or bad WWW-Authenticate header (%s).\n", hdr);
11409
2a3466f4a32c [gaim-migrate @ 13646]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11396
diff changeset
414 }
2a3466f4a32c [gaim-migrate @ 13646]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11396
diff changeset
415
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
416 }
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
417
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
418 static void simple_canwrite_cb(gpointer data, gint source, PurpleInputCondition cond) {
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
419 PurpleConnection *gc = data;
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
420 struct simple_account_data *sip = gc->proto_data;
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
421 gsize max_write;
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
422 gssize written;
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
423
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
424 max_write = purple_circ_buffer_get_max_read(sip->txbuf);
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
425
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
426 if(max_write == 0) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
427 purple_input_remove(sip->tx_handler);
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
428 sip->tx_handler = 0;
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
429 return;
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
430 }
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
431
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
432 written = write(sip->fd, sip->txbuf->outptr, max_write);
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
433
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
434 if(written < 0 && errno == EAGAIN)
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
435 written = 0;
27635
0cd19038c417 More uniformity among disconnect error messages
Mark Doliner <markdoliner@pidgin.im>
parents: 27350
diff changeset
436 else if (written <= 0) {
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
437 /*TODO: do we really want to disconnect on a failure to write?*/
27635
0cd19038c417 More uniformity among disconnect error messages
Mark Doliner <markdoliner@pidgin.im>
parents: 27350
diff changeset
438 gchar *tmp = g_strdup_printf(_("Lost connection with server: %s"),
0cd19038c417 More uniformity among disconnect error messages
Mark Doliner <markdoliner@pidgin.im>
parents: 27350
diff changeset
439 g_strerror(errno));
21279
40685e1f50ca Rename:
Will Thompson <resiak@pidgin.im>
parents: 21152
diff changeset
440 purple_connection_error_reason(gc,
27635
0cd19038c417 More uniformity among disconnect error messages
Mark Doliner <markdoliner@pidgin.im>
parents: 27350
diff changeset
441 PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
0cd19038c417 More uniformity among disconnect error messages
Mark Doliner <markdoliner@pidgin.im>
parents: 27350
diff changeset
442 g_free(tmp);
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
443 return;
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
444 }
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
445
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
446 purple_circ_buffer_mark_read(sip->txbuf, written);
11346
4af1dc4b2c44 [gaim-migrate @ 13563]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11345
diff changeset
447 }
4af1dc4b2c44 [gaim-migrate @ 13563]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11345
diff changeset
448
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
449 static void simple_input_cb(gpointer data, gint source, PurpleInputCondition cond);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
450
27635
0cd19038c417 More uniformity among disconnect error messages
Mark Doliner <markdoliner@pidgin.im>
parents: 27350
diff changeset
451 static void send_later_cb(gpointer data, gint source, const gchar *error_message) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
452 PurpleConnection *gc = data;
14180
77010795da2c [gaim-migrate @ 16752]
Mark Doliner <markdoliner@pidgin.im>
parents: 14170
diff changeset
453 struct simple_account_data *sip;
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
454 struct sip_connection *conn;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
455
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
456 if(source < 0) {
27635
0cd19038c417 More uniformity among disconnect error messages
Mark Doliner <markdoliner@pidgin.im>
parents: 27350
diff changeset
457 gchar *tmp = g_strdup_printf(_("Unable to connect: %s"),
0cd19038c417 More uniformity among disconnect error messages
Mark Doliner <markdoliner@pidgin.im>
parents: 27350
diff changeset
458 error_message);
21279
40685e1f50ca Rename:
Will Thompson <resiak@pidgin.im>
parents: 21152
diff changeset
459 purple_connection_error_reason(gc,
27635
0cd19038c417 More uniformity among disconnect error messages
Mark Doliner <markdoliner@pidgin.im>
parents: 27350
diff changeset
460 PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
0cd19038c417 More uniformity among disconnect error messages
Mark Doliner <markdoliner@pidgin.im>
parents: 27350
diff changeset
461 g_free(tmp);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
462 return;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
463 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
464
14180
77010795da2c [gaim-migrate @ 16752]
Mark Doliner <markdoliner@pidgin.im>
parents: 14170
diff changeset
465 sip = gc->proto_data;
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
466 sip->fd = source;
13058
2bf79aa07199 [gaim-migrate @ 15420]
Daniel Atallah <datallah@pidgin.im>
parents: 12909
diff changeset
467 sip->connecting = FALSE;
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
468
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
469 simple_canwrite_cb(gc, sip->fd, PURPLE_INPUT_WRITE);
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
470
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
471 /* If there is more to write now, we need to register a handler */
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
472 if(sip->txbuf->bufused > 0)
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
473 sip->tx_handler = purple_input_add(sip->fd, PURPLE_INPUT_WRITE,
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
474 simple_canwrite_cb, gc);
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
475
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
476 conn = connection_create(sip, source);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
477 conn->inputhandler = purple_input_add(sip->fd, PURPLE_INPUT_READ, simple_input_cb, gc);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
478 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
479
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
480
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
481 static void sendlater(PurpleConnection *gc, const char *buf) {
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
482 struct simple_account_data *sip = gc->proto_data;
14151
34427f138b1f [gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents: 14132
diff changeset
483
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
484 if(!sip->connecting) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
485 purple_debug_info("simple", "connecting to %s port %d\n", sip->realhostname ? sip->realhostname : "{NULL}", sip->realport);
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
486 if (purple_proxy_connect(gc, sip->account, sip->realhostname, sip->realport, send_later_cb, gc) == NULL) {
27635
0cd19038c417 More uniformity among disconnect error messages
Mark Doliner <markdoliner@pidgin.im>
parents: 27350
diff changeset
487 purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("Unable to connect"));
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
488 }
13058
2bf79aa07199 [gaim-migrate @ 15420]
Daniel Atallah <datallah@pidgin.im>
parents: 12909
diff changeset
489 sip->connecting = TRUE;
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
490 }
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
491
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
492 if(purple_circ_buffer_get_max_read(sip->txbuf) > 0)
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
493 purple_circ_buffer_append(sip->txbuf, "\r\n", 2);
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
494
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
495 purple_circ_buffer_append(sip->txbuf, buf, strlen(buf));
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
496 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
497
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
498 static void sendout_pkt(PurpleConnection *gc, const char *buf) {
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
499 struct simple_account_data *sip = gc->proto_data;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
500 time_t currtime = time(NULL);
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
501 int writelen = strlen(buf);
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
502
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
503 purple_debug(PURPLE_DEBUG_MISC, "simple", "\n\nsending - %s\n######\n%s\n######\n\n", ctime(&currtime), buf);
11189
5ac07336091e [gaim-migrate @ 13307]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11181
diff changeset
504 if(sip->udp) {
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
505 if(sendto(sip->fd, buf, writelen, 0, (struct sockaddr*)&sip->serveraddr, sizeof(struct sockaddr_in)) < writelen) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
506 purple_debug_info("simple", "could not send packet\n");
11189
5ac07336091e [gaim-migrate @ 13307]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11181
diff changeset
507 }
5ac07336091e [gaim-migrate @ 13307]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11181
diff changeset
508 } else {
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
509 int ret;
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
510 if(sip->fd < 0) {
11189
5ac07336091e [gaim-migrate @ 13307]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11181
diff changeset
511 sendlater(gc, buf);
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
512 return;
11189
5ac07336091e [gaim-migrate @ 13307]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11181
diff changeset
513 }
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
514
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
515 if(sip->tx_handler) {
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
516 ret = -1;
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
517 errno = EAGAIN;
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
518 } else
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
519 ret = write(sip->fd, buf, writelen);
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
520
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
521 if (ret < 0 && errno == EAGAIN)
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
522 ret = 0;
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
523 else if(ret <= 0) { /* XXX: When does this happen legitimately? */
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
524 sendlater(gc, buf);
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
525 return;
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
526 }
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
527
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
528 if (ret < writelen) {
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
529 if(!sip->tx_handler)
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
530 sip->tx_handler = purple_input_add(sip->fd,
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
531 PURPLE_INPUT_WRITE, simple_canwrite_cb,
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
532 gc);
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
533
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
534 /* XXX: is it OK to do this? You might get part of a request sent
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
535 with part of another. */
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
536 if(sip->txbuf->bufused > 0)
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
537 purple_circ_buffer_append(sip->txbuf, "\r\n", 2);
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
538
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
539 purple_circ_buffer_append(sip->txbuf, buf + ret,
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
540 writelen - ret);
11189
5ac07336091e [gaim-migrate @ 13307]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11181
diff changeset
541 }
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
542 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
543 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
544
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
545 static int simple_send_raw(PurpleConnection *gc, const char *buf, int len)
14604
67a7c42a8654 [gaim-migrate @ 17263]
Sean Egan <seanegan@pidgin.im>
parents: 14370
diff changeset
546 {
67a7c42a8654 [gaim-migrate @ 17263]
Sean Egan <seanegan@pidgin.im>
parents: 14370
diff changeset
547 sendout_pkt(gc, buf);
67a7c42a8654 [gaim-migrate @ 17263]
Sean Egan <seanegan@pidgin.im>
parents: 14370
diff changeset
548 return len;
67a7c42a8654 [gaim-migrate @ 17263]
Sean Egan <seanegan@pidgin.im>
parents: 14370
diff changeset
549 }
67a7c42a8654 [gaim-migrate @ 17263]
Sean Egan <seanegan@pidgin.im>
parents: 14370
diff changeset
550
11194
47dc0e9a757a [gaim-migrate @ 13317]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11192
diff changeset
551 static void sendout_sipmsg(struct simple_account_data *sip, struct sipmsg *msg) {
12741
14cd04e157b1 [gaim-migrate @ 15088]
Daniel Atallah <datallah@pidgin.im>
parents: 12730
diff changeset
552 GSList *tmp = msg->headers;
11194
47dc0e9a757a [gaim-migrate @ 13317]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11192
diff changeset
553 gchar *name;
47dc0e9a757a [gaim-migrate @ 13317]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11192
diff changeset
554 gchar *value;
12741
14cd04e157b1 [gaim-migrate @ 15088]
Daniel Atallah <datallah@pidgin.im>
parents: 12730
diff changeset
555 GString *outstr = g_string_new("");
14cd04e157b1 [gaim-migrate @ 15088]
Daniel Atallah <datallah@pidgin.im>
parents: 12730
diff changeset
556 g_string_append_printf(outstr, "%s %s SIP/2.0\r\n", msg->method, msg->target);
11194
47dc0e9a757a [gaim-migrate @ 13317]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11192
diff changeset
557 while(tmp) {
12741
14cd04e157b1 [gaim-migrate @ 15088]
Daniel Atallah <datallah@pidgin.im>
parents: 12730
diff changeset
558 name = ((struct siphdrelement*) (tmp->data))->name;
14cd04e157b1 [gaim-migrate @ 15088]
Daniel Atallah <datallah@pidgin.im>
parents: 12730
diff changeset
559 value = ((struct siphdrelement*) (tmp->data))->value;
14cd04e157b1 [gaim-migrate @ 15088]
Daniel Atallah <datallah@pidgin.im>
parents: 12730
diff changeset
560 g_string_append_printf(outstr, "%s: %s\r\n", name, value);
11194
47dc0e9a757a [gaim-migrate @ 13317]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11192
diff changeset
561 tmp = g_slist_next(tmp);
47dc0e9a757a [gaim-migrate @ 13317]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11192
diff changeset
562 }
12741
14cd04e157b1 [gaim-migrate @ 15088]
Daniel Atallah <datallah@pidgin.im>
parents: 12730
diff changeset
563 g_string_append_printf(outstr, "\r\n%s", msg->body ? msg->body : "");
14cd04e157b1 [gaim-migrate @ 15088]
Daniel Atallah <datallah@pidgin.im>
parents: 12730
diff changeset
564 sendout_pkt(sip->gc, outstr->str);
14cd04e157b1 [gaim-migrate @ 15088]
Daniel Atallah <datallah@pidgin.im>
parents: 12730
diff changeset
565 g_string_free(outstr, TRUE);
11194
47dc0e9a757a [gaim-migrate @ 13317]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11192
diff changeset
566 }
47dc0e9a757a [gaim-migrate @ 13317]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11192
diff changeset
567
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
568 static void send_sip_response(PurpleConnection *gc, struct sipmsg *msg, int code,
14131
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
569 const char *text, const char *body) {
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
570 GSList *tmp = msg->headers;
12741
14cd04e157b1 [gaim-migrate @ 15088]
Daniel Atallah <datallah@pidgin.im>
parents: 12730
diff changeset
571 gchar *name;
14cd04e157b1 [gaim-migrate @ 15088]
Daniel Atallah <datallah@pidgin.im>
parents: 12730
diff changeset
572 gchar *value;
14cd04e157b1 [gaim-migrate @ 15088]
Daniel Atallah <datallah@pidgin.im>
parents: 12730
diff changeset
573 GString *outstr = g_string_new("");
13093
e27434c31f00 [gaim-migrate @ 15454]
Daniel Atallah <datallah@pidgin.im>
parents: 13089
diff changeset
574
12754
539bcb15199f [gaim-migrate @ 15101]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 12753
diff changeset
575 /* When sending the acknowlegements and errors, the content length from the original
539bcb15199f [gaim-migrate @ 15101]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 12753
diff changeset
576 message is still here, but there is no body; we need to make sure we're sending the
539bcb15199f [gaim-migrate @ 15101]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 12753
diff changeset
577 correct content length */
539bcb15199f [gaim-migrate @ 15101]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 12753
diff changeset
578 sipmsg_remove_header(msg, "Content-Length");
539bcb15199f [gaim-migrate @ 15101]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 12753
diff changeset
579 if(body) {
539bcb15199f [gaim-migrate @ 15101]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 12753
diff changeset
580 gchar len[12];
539bcb15199f [gaim-migrate @ 15101]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 12753
diff changeset
581 sprintf(len, "%" G_GSIZE_FORMAT , strlen(body));
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
582 sipmsg_add_header(msg, "Content-Length", len);
12754
539bcb15199f [gaim-migrate @ 15101]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 12753
diff changeset
583 }
539bcb15199f [gaim-migrate @ 15101]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 12753
diff changeset
584 else
539bcb15199f [gaim-migrate @ 15101]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 12753
diff changeset
585 sipmsg_add_header(msg, "Content-Length", "0");
12741
14cd04e157b1 [gaim-migrate @ 15088]
Daniel Atallah <datallah@pidgin.im>
parents: 12730
diff changeset
586 g_string_append_printf(outstr, "SIP/2.0 %d %s\r\n", code, text);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
587 while(tmp) {
12741
14cd04e157b1 [gaim-migrate @ 15088]
Daniel Atallah <datallah@pidgin.im>
parents: 12730
diff changeset
588 name = ((struct siphdrelement*) (tmp->data))->name;
14cd04e157b1 [gaim-migrate @ 15088]
Daniel Atallah <datallah@pidgin.im>
parents: 12730
diff changeset
589 value = ((struct siphdrelement*) (tmp->data))->value;
12745
1dc3525647c2 [gaim-migrate @ 15092]
Daniel Atallah <datallah@pidgin.im>
parents: 12741
diff changeset
590
12741
14cd04e157b1 [gaim-migrate @ 15088]
Daniel Atallah <datallah@pidgin.im>
parents: 12730
diff changeset
591 g_string_append_printf(outstr, "%s: %s\r\n", name, value);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
592 tmp = g_slist_next(tmp);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
593 }
12741
14cd04e157b1 [gaim-migrate @ 15088]
Daniel Atallah <datallah@pidgin.im>
parents: 12730
diff changeset
594 g_string_append_printf(outstr, "\r\n%s", body ? body : "");
14cd04e157b1 [gaim-migrate @ 15088]
Daniel Atallah <datallah@pidgin.im>
parents: 12730
diff changeset
595 sendout_pkt(gc, outstr->str);
14cd04e157b1 [gaim-migrate @ 15088]
Daniel Atallah <datallah@pidgin.im>
parents: 12730
diff changeset
596 g_string_free(outstr, TRUE);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
597 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
598
11194
47dc0e9a757a [gaim-migrate @ 13317]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11192
diff changeset
599 static void transactions_remove(struct simple_account_data *sip, struct transaction *trans) {
47dc0e9a757a [gaim-migrate @ 13317]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11192
diff changeset
600 if(trans->msg) sipmsg_free(trans->msg);
47dc0e9a757a [gaim-migrate @ 13317]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11192
diff changeset
601 sip->transactions = g_slist_remove(sip->transactions, trans);
47dc0e9a757a [gaim-migrate @ 13317]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11192
diff changeset
602 g_free(trans);
47dc0e9a757a [gaim-migrate @ 13317]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11192
diff changeset
603 }
47dc0e9a757a [gaim-migrate @ 13317]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11192
diff changeset
604
14131
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
605 static void transactions_add_buf(struct simple_account_data *sip, const gchar *buf, void *callback) {
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
606 struct transaction *trans = g_new0(struct transaction, 1);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
607 trans->time = time(NULL);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
608 trans->msg = sipmsg_parse_msg(buf);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
609 trans->cseq = sipmsg_find_header(trans->msg, "CSeq");
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
610 trans->callback = callback;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
611 sip->transactions = g_slist_append(sip->transactions, trans);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
612 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
613
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
614 static struct transaction *transactions_find(struct simple_account_data *sip, struct sipmsg *msg) {
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
615 struct transaction *trans;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
616 GSList *transactions = sip->transactions;
21100
814637ced463 Some constification, which also found and fixed some potential double-free
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21076
diff changeset
617 const gchar *cseq = sipmsg_find_header(msg, "CSeq");
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
618
16232
b5838c6cb3ed simple-crashfix.diff from achris in ticket #98. This is a fix for the crasher,
Richard Laager <rlaager@pidgin.im>
parents: 16209
diff changeset
619 if (cseq) {
b5838c6cb3ed simple-crashfix.diff from achris in ticket #98. This is a fix for the crasher,
Richard Laager <rlaager@pidgin.im>
parents: 16209
diff changeset
620 while(transactions) {
b5838c6cb3ed simple-crashfix.diff from achris in ticket #98. This is a fix for the crasher,
Richard Laager <rlaager@pidgin.im>
parents: 16209
diff changeset
621 trans = transactions->data;
b5838c6cb3ed simple-crashfix.diff from achris in ticket #98. This is a fix for the crasher,
Richard Laager <rlaager@pidgin.im>
parents: 16209
diff changeset
622 if(!strcmp(trans->cseq, cseq)) {
b5838c6cb3ed simple-crashfix.diff from achris in ticket #98. This is a fix for the crasher,
Richard Laager <rlaager@pidgin.im>
parents: 16209
diff changeset
623 return trans;
b5838c6cb3ed simple-crashfix.diff from achris in ticket #98. This is a fix for the crasher,
Richard Laager <rlaager@pidgin.im>
parents: 16209
diff changeset
624 }
b5838c6cb3ed simple-crashfix.diff from achris in ticket #98. This is a fix for the crasher,
Richard Laager <rlaager@pidgin.im>
parents: 16209
diff changeset
625 transactions = transactions->next;
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
626 }
16232
b5838c6cb3ed simple-crashfix.diff from achris in ticket #98. This is a fix for the crasher,
Richard Laager <rlaager@pidgin.im>
parents: 16209
diff changeset
627 } else {
b5838c6cb3ed simple-crashfix.diff from achris in ticket #98. This is a fix for the crasher,
Richard Laager <rlaager@pidgin.im>
parents: 16209
diff changeset
628 purple_debug(PURPLE_DEBUG_MISC, "simple", "Received message contains no CSeq header.\n");
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
629 }
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
630
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
631 return NULL;
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
632 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
633
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
634 static void send_sip_request(PurpleConnection *gc, const gchar *method,
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
635 const gchar *url, const gchar *to, const gchar *addheaders,
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
636 const gchar *body, struct sip_dialog *dialog, TransCallback tc) {
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
637 struct simple_account_data *sip = gc->proto_data;
13093
e27434c31f00 [gaim-migrate @ 15454]
Daniel Atallah <datallah@pidgin.im>
parents: 13089
diff changeset
638 char *callid = dialog ? g_strdup(dialog->callid) : gencallid();
14213
1d35fd2c5713 [gaim-migrate @ 16796]
Daniel Atallah <datallah@pidgin.im>
parents: 14180
diff changeset
639 char *auth = NULL;
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
640 const char *addh = "";
12216
d80739091a63 [gaim-migrate @ 14518]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 12196
diff changeset
641 gchar *branch = genbranch();
14131
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
642 gchar *tag = NULL;
12216
d80739091a63 [gaim-migrate @ 14518]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 12196
diff changeset
643 char *buf;
d80739091a63 [gaim-migrate @ 14518]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 12196
diff changeset
644
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
645 if(!strcmp(method, "REGISTER")) {
13093
e27434c31f00 [gaim-migrate @ 15454]
Daniel Atallah <datallah@pidgin.im>
parents: 13089
diff changeset
646 if(sip->regcallid) {
e27434c31f00 [gaim-migrate @ 15454]
Daniel Atallah <datallah@pidgin.im>
parents: 13089
diff changeset
647 g_free(callid);
e27434c31f00 [gaim-migrate @ 15454]
Daniel Atallah <datallah@pidgin.im>
parents: 13089
diff changeset
648 callid = g_strdup(sip->regcallid);
e27434c31f00 [gaim-migrate @ 15454]
Daniel Atallah <datallah@pidgin.im>
parents: 13089
diff changeset
649 }
12196
92a07bdbe0df [gaim-migrate @ 14498]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 12143
diff changeset
650 else sip->regcallid = g_strdup(callid);
92a07bdbe0df [gaim-migrate @ 14498]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 12143
diff changeset
651 }
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
652
13093
e27434c31f00 [gaim-migrate @ 15454]
Daniel Atallah <datallah@pidgin.im>
parents: 13089
diff changeset
653 if(addheaders) addh = addheaders;
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
654 if(sip->registrar.type && !strcmp(method, "REGISTER")) {
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
655 buf = auth_header(sip, &sip->registrar, method, url);
17187
78b7ae95ad45 Fix an extra \r\n in the Authorization header. Fixes #965.
Daniel Atallah <datallah@pidgin.im>
parents: 17185
diff changeset
656 auth = g_strdup_printf("Authorization: %s\r\n", buf);
11346
4af1dc4b2c44 [gaim-migrate @ 13563]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11345
diff changeset
657 g_free(buf);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
658 purple_debug(PURPLE_DEBUG_MISC, "simple", "header %s", auth);
17187
78b7ae95ad45 Fix an extra \r\n in the Authorization header. Fixes #965.
Daniel Atallah <datallah@pidgin.im>
parents: 17185
diff changeset
659 } else if(sip->proxy.type && strcmp(method, "REGISTER")) {
11346
4af1dc4b2c44 [gaim-migrate @ 13563]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11345
diff changeset
660 buf = auth_header(sip, &sip->proxy, method, url);
17187
78b7ae95ad45 Fix an extra \r\n in the Authorization header. Fixes #965.
Daniel Atallah <datallah@pidgin.im>
parents: 17185
diff changeset
661 auth = g_strdup_printf("Proxy-Authorization: %s\r\n", buf);
11346
4af1dc4b2c44 [gaim-migrate @ 13563]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11345
diff changeset
662 g_free(buf);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
663 purple_debug(PURPLE_DEBUG_MISC, "simple", "header %s", auth);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
664 }
12767
4870d7755883 [gaim-migrate @ 15114]
Daniel Atallah <datallah@pidgin.im>
parents: 12760
diff changeset
665
14131
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
666 if (!dialog)
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
667 tag = gentag();
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
668
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
669 buf = g_strdup_printf("%s %s SIP/2.0\r\n"
11190
16f02ac58a38 [gaim-migrate @ 13308]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11189
diff changeset
670 "Via: SIP/2.0/%s %s:%d;branch=%s\r\n"
13085
c80913901342 [gaim-migrate @ 15446]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13084
diff changeset
671 /* Don't know what epid is, but LCS wants it */
c80913901342 [gaim-migrate @ 15446]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13084
diff changeset
672 "From: <sip:%s@%s>;tag=%s;epid=1234567890\r\n"
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
673 "To: <%s>%s%s\r\n"
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
674 "Max-Forwards: 10\r\n"
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
675 "CSeq: %d %s\r\n"
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
676 "User-Agent: Purple/" VERSION "\r\n"
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
677 "Call-ID: %s\r\n"
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
678 "%s%s"
11658
5d1ee2125070 [gaim-migrate @ 13943]
Nathan Walp <nwalp@pidgin.im>
parents: 11650
diff changeset
679 "Content-Length: %" G_GSIZE_FORMAT "\r\n\r\n%s",
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
680 method,
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
681 url,
11190
16f02ac58a38 [gaim-migrate @ 13308]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11189
diff changeset
682 sip->udp ? "UDP" : "TCP",
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
683 purple_network_get_my_ip(-1),
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
684 sip->listenport,
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
685 branch,
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
686 sip->username,
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
687 sip->servername,
14131
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
688 dialog ? dialog->ourtag : tag,
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
689 to,
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
690 dialog ? ";tag=" : "",
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
691 dialog ? dialog->theirtag : "",
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
692 ++sip->cseq,
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
693 method,
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
694 callid,
14213
1d35fd2c5713 [gaim-migrate @ 16796]
Daniel Atallah <datallah@pidgin.im>
parents: 14180
diff changeset
695 auth ? auth : "",
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
696 addh,
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
697 strlen(body),
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
698 body);
14131
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
699
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
700 g_free(tag);
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
701 g_free(auth);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
702 g_free(branch);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
703 g_free(callid);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
704
11341
5511bbeeb3b4 [gaim-migrate @ 13555]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11327
diff changeset
705 /* add to ongoing transactions */
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
706
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
707 transactions_add_buf(sip, buf, tc);
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
708
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
709 sendout_pkt(gc, buf);
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
710
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
711 g_free(buf);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
712 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
713
13178
824d50326672 [gaim-migrate @ 15540]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13130
diff changeset
714 static char *get_contact(struct simple_account_data *sip) {
21417
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
715 return g_strdup_printf("<sip:%s@%s:%d;transport=%s>;methods=\"MESSAGE, SUBSCRIBE, NOTIFY\"",
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
716 sip->username, purple_network_get_my_ip(-1),
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
717 sip->listenport,
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
718 sip->udp ? "udp" : "tcp");
13178
824d50326672 [gaim-migrate @ 15540]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13130
diff changeset
719 }
824d50326672 [gaim-migrate @ 15540]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13130
diff changeset
720
11194
47dc0e9a757a [gaim-migrate @ 13317]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11192
diff changeset
721 static void do_register_exp(struct simple_account_data *sip, int expire) {
19991
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
722 char *uri, *to, *contact, *hdr;
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
723
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
724 sip->reregister = time(NULL) + expire - 50;
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
725
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
726 uri = g_strdup_printf("sip:%s", sip->servername);
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
727 to = g_strdup_printf("sip:%s@%s", sip->username, sip->servername);
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
728 contact = get_contact(sip);
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
729 hdr = g_strdup_printf("Contact: %s\r\nExpires: %d\r\n", contact, expire);
13178
824d50326672 [gaim-migrate @ 15540]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13130
diff changeset
730 g_free(contact);
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
731
19991
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
732 sip->registerstatus = SIMPLE_REGISTER_SENT;
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
733
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
734 send_sip_request(sip->gc, "REGISTER", uri, to, hdr, "", NULL,
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
735 process_register_response);
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
736
13178
824d50326672 [gaim-migrate @ 15540]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13130
diff changeset
737 g_free(hdr);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
738 g_free(uri);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
739 g_free(to);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
740 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
741
11194
47dc0e9a757a [gaim-migrate @ 13317]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11192
diff changeset
742 static void do_register(struct simple_account_data *sip) {
47dc0e9a757a [gaim-migrate @ 13317]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11192
diff changeset
743 do_register_exp(sip, sip->registerexpire);
47dc0e9a757a [gaim-migrate @ 13317]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11192
diff changeset
744 }
47dc0e9a757a [gaim-migrate @ 13317]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11192
diff changeset
745
14131
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
746 static gchar *parse_from(const gchar *hdr) {
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
747 gchar *from;
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
748 const gchar *tmp, *tmp2 = hdr;
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
749
14131
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
750 if(!hdr) return NULL;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
751 purple_debug_info("simple", "parsing address out of %s\n", hdr);
14131
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
752 tmp = strchr(hdr, '<');
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
753
11341
5511bbeeb3b4 [gaim-migrate @ 13555]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11327
diff changeset
754 /* i hate the different SIP UA behaviours... */
5511bbeeb3b4 [gaim-migrate @ 13555]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11327
diff changeset
755 if(tmp) { /* sip address in <...> */
14131
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
756 tmp2 = tmp + 1;
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
757 tmp = strchr(tmp2, '>');
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
758 if(tmp) {
14131
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
759 from = g_strndup(tmp2, tmp - tmp2);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
760 } else {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
761 purple_debug_info("simple", "found < without > in From\n");
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
762 return NULL;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
763 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
764 } else {
14131
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
765 tmp = strchr(tmp2, ';');
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
766 if(tmp) {
14131
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
767 from = g_strndup(tmp2, tmp - tmp2);
11483
098043515257 [gaim-migrate @ 13725]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11439
diff changeset
768 } else {
14131
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
769 from = g_strdup(tmp2);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
770 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
771 }
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
772 purple_debug_info("simple", "got %s\n", from);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
773 return from;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
774 }
21417
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
775 static gchar *find_tag(const gchar *);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
776
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
777 static gboolean process_subscribe_response(struct simple_account_data *sip, struct sipmsg *msg, struct transaction *tc) {
21417
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
778 gchar *to = NULL;
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
779 struct simple_buddy *b = NULL;
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
780 gchar *theirtag = NULL, *ourtag = NULL;
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
781 const gchar *callid = NULL;
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
782
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
783 purple_debug_info("simple", "process subscribe response\n");
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
784
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
785 if(msg->response == 200 || msg->response == 202) {
21417
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
786 if ( (to = parse_from(sipmsg_find_header(msg, "To"))) &&
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
787 (b = g_hash_table_lookup(sip->buddies, to)) &&
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
788 !(b->dialog))
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
789 {
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
790 purple_debug_info("simple", "creating dialog"
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
791 " information for a subscription.\n");
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
792
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
793 theirtag = find_tag(sipmsg_find_header(msg, "To"));
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
794 ourtag = find_tag(sipmsg_find_header(msg, "From"));
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
795 callid = sipmsg_find_header(msg, "Call-ID");
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
796
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
797 if (theirtag && ourtag && callid)
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
798 {
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
799 b->dialog = g_new0(struct sip_dialog, 1);
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
800 b->dialog->ourtag = g_strdup(ourtag);
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
801 b->dialog->theirtag = g_strdup(theirtag);
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
802 b->dialog->callid = g_strdup(callid);
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
803
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 30138
diff changeset
804 purple_debug_info("simple", "ourtag: %s\n",
21417
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
805 ourtag);
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 30138
diff changeset
806 purple_debug_info("simple", "theirtag: %s\n",
21417
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
807 theirtag);
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 30138
diff changeset
808 purple_debug_info("simple", "callid: %s\n",
21417
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
809 callid);
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
810 g_free(theirtag);
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
811 g_free(ourtag);
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
812 }
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
813 }
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
814 else
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
815 {
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
816 purple_debug_info("simple", "cannot create dialog!\n");
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
817 }
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
818 return TRUE;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
819 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
820
14131
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
821 to = parse_from(sipmsg_find_header(tc->msg, "To")); /* cant be NULL since it is our own msg */
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
822
11341
5511bbeeb3b4 [gaim-migrate @ 13555]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11327
diff changeset
823 /* we can not subscribe -> user is offline (TODO unknown status?) */
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
824
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
825 purple_prpl_got_user_status(sip->account, to, "offline", NULL);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
826 g_free(to);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
827 return TRUE;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
828 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
829
21417
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
830 static void simple_subscribe_exp(struct simple_account_data *sip, struct simple_buddy *buddy, int expiration) {
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
831 gchar *contact, *to, *tmp, *tmp2;
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
832
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
833 tmp2 = g_strdup_printf(
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
834 "Expires: %d\r\n"
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
835 "Accept: application/pidf+xml, application/xpidf+xml\r\n"
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
836 "Event: presence\r\n",
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
837 expiration);
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
838
25603
d9748fa08309 This is a combination of patches from darkrain42 and Marcus Sundberg to fix
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 25206
diff changeset
839 if(strncmp(buddy->name, "sip:", 4))
d9748fa08309 This is a combination of patches from darkrain42 and Marcus Sundberg to fix
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 25206
diff changeset
840 to = g_strdup_printf("sip:%s", buddy->name);
d9748fa08309 This is a combination of patches from darkrain42 and Marcus Sundberg to fix
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 25206
diff changeset
841 else
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
842 to = g_strdup(buddy->name);
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
843
13178
824d50326672 [gaim-migrate @ 15540]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13130
diff changeset
844 tmp = get_contact(sip);
21417
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
845 contact = g_strdup_printf("%sContact: %s\r\n", tmp2, tmp);
13178
824d50326672 [gaim-migrate @ 15540]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13130
diff changeset
846 g_free(tmp);
21417
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
847 g_free(tmp2);
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
848
21417
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
849 send_sip_request(sip->gc, "SUBSCRIBE", to, to, contact,"",buddy->dialog,
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
850 (expiration > 0) ? process_subscribe_response : NULL);
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
851
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
852 g_free(to);
11341
5511bbeeb3b4 [gaim-migrate @ 13555]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11327
diff changeset
853 g_free(contact);
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
854
11341
5511bbeeb3b4 [gaim-migrate @ 13555]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11327
diff changeset
855 /* resubscribe before subscription expires */
5511bbeeb3b4 [gaim-migrate @ 13555]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11327
diff changeset
856 /* add some jitter */
21417
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
857 if (expiration > 60)
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
858 buddy->resubscribe = time(NULL) + (expiration - 60) + (rand() % 50);
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
859 else if (expiration > 0)
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
860 buddy->resubscribe = time(NULL) + ((int) (expiration / 2));
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
861 }
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
862
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
863 static void simple_subscribe(struct simple_account_data *sip, struct simple_buddy *buddy) {
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
864 simple_subscribe_exp(sip, buddy, SUBSCRIBE_EXPIRATION);
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
865 }
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
866
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
867 static void simple_unsubscribe(char *name, struct simple_buddy *buddy, struct simple_account_data *sip) {
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
868 if (buddy->dialog)
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
869 {
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
870 purple_debug_info("simple", "Unsubscribing from %s\n", name);
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
871 simple_subscribe_exp(sip, buddy, 0);
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
872 }
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
873 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
874
13348
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
875 static gboolean simple_add_lcs_contacts(struct simple_account_data *sip, struct sipmsg *msg, struct transaction *tc) {
21100
814637ced463 Some constification, which also found and fixed some potential double-free
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21076
diff changeset
876 const gchar *tmp;
13348
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
877 xmlnode *item, *group, *isc;
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
878 const char *name_group;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
879 PurpleBuddy *b;
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
880 PurpleGroup *g = NULL;
13348
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
881 struct simple_buddy *bs;
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
882 int len = msg->bodylen;
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
883
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
884
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
885 tmp = sipmsg_find_header(msg, "Event");
25603
d9748fa08309 This is a combination of patches from darkrain42 and Marcus Sundberg to fix
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 25206
diff changeset
886 if(tmp && !strncmp(tmp, "vnd-microsoft-roaming-contacts", 30)){
13348
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
887
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
888 purple_debug_info("simple", "simple_add_lcs_contacts->%s-%d\n", msg->body, len);
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
889 /*Convert the contact from XML to Purple Buddies*/
14131
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
890 isc = xmlnode_from_str(msg->body, len);
13348
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
891
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
892 /* ToDo. Find for all groups */
14131
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
893 if ((group = xmlnode_get_child(isc, "group"))) {
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
894 name_group = xmlnode_get_attrib(group, "name");
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
895 purple_debug_info("simple", "name_group->%s\n", name_group);
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
896 g = purple_find_group(name_group);
14131
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
897 if(!g)
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
898 g = purple_group_new(name_group);
14131
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
899 }
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
900
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
901 if (!g) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
902 g = purple_find_group("Buddies");
14131
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
903 if(!g)
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
904 g = purple_group_new("Buddies");
13348
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
905 }
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
906
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
907 for(item = xmlnode_get_child(isc, "contact"); item; item = xmlnode_get_next_twin(item))
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
908 {
33782
1690e0b2c508 Fix a bunch of unused variables
Daniel Atallah <datallah@pidgin.im>
parents: 31949
diff changeset
909 const char *uri;
14131
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
910 char *buddy_name;
13348
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
911 uri = xmlnode_get_attrib(item, "uri");
33782
1690e0b2c508 Fix a bunch of unused variables
Daniel Atallah <datallah@pidgin.im>
parents: 31949
diff changeset
912 /*name = xmlnode_get_attrib(item, "name");
1690e0b2c508 Fix a bunch of unused variables
Daniel Atallah <datallah@pidgin.im>
parents: 31949
diff changeset
913 groups = xmlnode_get_attrib(item, "groups");*/
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
914 purple_debug_info("simple", "URI->%s\n", uri);
14131
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
915
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
916 buddy_name = g_strdup_printf("sip:%s", uri);
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
917
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
918 b = purple_find_buddy(sip->account, buddy_name);
13348
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
919 if(!b){
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
920 b = purple_buddy_new(sip->account, buddy_name, uri);
13348
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
921 }
14131
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
922 g_free(buddy_name);
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
923
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
924 purple_blist_add_buddy(b, NULL, g, NULL);
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
925 purple_blist_alias_buddy(b, uri);
13348
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
926 bs = g_new0(struct simple_buddy, 1);
24398
4865c2ee6ea8 Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 24040
diff changeset
927 bs->name = g_strdup(purple_buddy_get_name(b));
13348
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
928 g_hash_table_insert(sip->buddies, bs->name, bs);
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
929 }
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
930 xmlnode_free(isc);
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
931 }
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
932 return 0;
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
933 }
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
934
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
935 static void simple_subscribe_buddylist(struct simple_account_data *sip) {
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
936 gchar *contact = "Event: vnd-microsoft-roaming-contacts\r\nAccept: application/vnd-microsoft-roaming-contacts+xml\r\nSupported: com.microsoft.autoextend\r\nSupported: ms-benotify\r\nProxy-Require: ms-benotify\r\nSupported: ms-piggyback-first-notify\r\n";
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
937 gchar *to;
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
938 gchar *tmp;
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
939 to = g_strdup_printf("sip:%s@%s", sip->username, sip->servername);
14131
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
940
13348
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
941 tmp = get_contact(sip);
14131
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
942
13348
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
943 contact = g_strdup_printf("%sContact: %s\r\n", contact, tmp);
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
944 g_free(tmp);
14131
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
945
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
946 send_sip_request(sip->gc, "SUBSCRIBE", to, to, contact, "", NULL, simple_add_lcs_contacts);
13348
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
947
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
948 g_free(to);
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
949 g_free(contact);
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
950 }
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
951
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
952
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
953 static void simple_buddy_resub(char *name, struct simple_buddy *buddy, struct simple_account_data *sip) {
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
954 time_t curtime = time(NULL);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
955 purple_debug_info("simple", "buddy resub\n");
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
956 if(buddy->resubscribe < curtime) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
957 purple_debug(PURPLE_DEBUG_MISC, "simple", "simple_buddy_resub %s\n", name);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
958 simple_subscribe(sip, buddy);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
959 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
960 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
961
11194
47dc0e9a757a [gaim-migrate @ 13317]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11192
diff changeset
962 static gboolean resend_timeout(struct simple_account_data *sip) {
47dc0e9a757a [gaim-migrate @ 13317]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11192
diff changeset
963 GSList *tmp = sip->transactions;
47dc0e9a757a [gaim-migrate @ 13317]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11192
diff changeset
964 time_t currtime = time(NULL);
47dc0e9a757a [gaim-migrate @ 13317]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11192
diff changeset
965 while(tmp) {
47dc0e9a757a [gaim-migrate @ 13317]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11192
diff changeset
966 struct transaction *trans = tmp->data;
47dc0e9a757a [gaim-migrate @ 13317]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11192
diff changeset
967 tmp = tmp->next;
22709
6bd336964410 Printf warning fixes.
Daniel Atallah <datallah@pidgin.im>
parents: 22634
diff changeset
968 purple_debug_info("simple", "have open transaction age: %lu\n", currtime- trans->time);
11194
47dc0e9a757a [gaim-migrate @ 13317]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11192
diff changeset
969 if((currtime - trans->time > 5) && trans->retries >= 1) {
11341
5511bbeeb3b4 [gaim-migrate @ 13555]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11327
diff changeset
970 /* TODO 408 */
11194
47dc0e9a757a [gaim-migrate @ 13317]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11192
diff changeset
971 } else {
47dc0e9a757a [gaim-migrate @ 13317]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11192
diff changeset
972 if((currtime - trans->time > 2) && trans->retries == 0) {
47dc0e9a757a [gaim-migrate @ 13317]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11192
diff changeset
973 trans->retries++;
47dc0e9a757a [gaim-migrate @ 13317]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11192
diff changeset
974 sendout_sipmsg(sip, trans->msg);
47dc0e9a757a [gaim-migrate @ 13317]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11192
diff changeset
975 }
47dc0e9a757a [gaim-migrate @ 13317]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11192
diff changeset
976 }
47dc0e9a757a [gaim-migrate @ 13317]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11192
diff changeset
977 }
47dc0e9a757a [gaim-migrate @ 13317]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11192
diff changeset
978 return TRUE;
47dc0e9a757a [gaim-migrate @ 13317]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11192
diff changeset
979 }
47dc0e9a757a [gaim-migrate @ 13317]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11192
diff changeset
980
12768
0783fffbd552 [gaim-migrate @ 15115]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 12767
diff changeset
981 static gboolean subscribe_timeout(struct simple_account_data *sip) {
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
982 GSList *tmp;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
983 time_t curtime = time(NULL);
11341
5511bbeeb3b4 [gaim-migrate @ 13555]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11327
diff changeset
984 /* register again if first registration expires */
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
985 if(sip->reregister < curtime) {
11194
47dc0e9a757a [gaim-migrate @ 13317]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11192
diff changeset
986 do_register(sip);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
987 }
21417
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
988
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
989 /* publish status again if our last update is about to expire. */
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 30138
diff changeset
990 if (sip->republish != -1 &&
21417
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
991 sip->republish < curtime &&
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
992 purple_account_get_bool(sip->account, "dopublish", TRUE))
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
993 {
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
994 purple_debug_info("simple", "subscribe_timeout: republishing status.\n");
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
995 send_open_publish(sip);
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
996 }
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
997
11341
5511bbeeb3b4 [gaim-migrate @ 13555]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11327
diff changeset
998 /* check for every subscription if we need to resubscribe */
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
999 g_hash_table_foreach(sip->buddies, (GHFunc)simple_buddy_resub, (gpointer)sip);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1000
11341
5511bbeeb3b4 [gaim-migrate @ 13555]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11327
diff changeset
1001 /* remove a timed out suscriber */
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1002 tmp = sip->watcher;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1003 while(tmp) {
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1004 struct simple_watcher *watcher = tmp->data;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1005 if(watcher->expire < curtime) {
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1006 watcher_remove(sip, watcher->name);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1007 tmp = sip->watcher;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1008 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1009 if(tmp) tmp = tmp->next;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1010 }
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
1011
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1012 return TRUE;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1013 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1014
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
1015 static void simple_send_message(struct simple_account_data *sip, const char *to, const char *msg, const char *type) {
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1016 gchar *hdr;
13185
ee7ac8a41ec4 [gaim-migrate @ 15547]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13178
diff changeset
1017 gchar *fullto;
25603
d9748fa08309 This is a combination of patches from darkrain42 and Marcus Sundberg to fix
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 25206
diff changeset
1018 if(strncmp(to, "sip:", 4))
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
1019 fullto = g_strdup_printf("sip:%s", to);
25603
d9748fa08309 This is a combination of patches from darkrain42 and Marcus Sundberg to fix
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 25206
diff changeset
1020 else
13185
ee7ac8a41ec4 [gaim-migrate @ 15547]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13178
diff changeset
1021 fullto = g_strdup(to);
25603
d9748fa08309 This is a combination of patches from darkrain42 and Marcus Sundberg to fix
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 25206
diff changeset
1022
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
1023 if(type) {
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
1024 hdr = g_strdup_printf("Content-Type: %s\r\n", type);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1025 } else {
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1026 hdr = g_strdup("Content-Type: text/plain\r\n");
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1027 }
13185
ee7ac8a41ec4 [gaim-migrate @ 15547]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13178
diff changeset
1028 send_sip_request(sip->gc, "MESSAGE", fullto, fullto, hdr, msg, NULL, NULL);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1029 g_free(hdr);
13185
ee7ac8a41ec4 [gaim-migrate @ 15547]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13178
diff changeset
1030 g_free(fullto);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1031 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1032
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1033 static int simple_im_send(PurpleConnection *gc, const char *who, const char *what, PurpleMessageFlags flags) {
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1034 struct simple_account_data *sip = gc->proto_data;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1035 char *to = g_strdup(who);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1036 char *text = purple_unescape_html(what);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1037 simple_send_message(sip, to, text, NULL);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1038 g_free(to);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1039 g_free(text);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1040 return 1;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1041 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1042
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1043 static void process_incoming_message(struct simple_account_data *sip, struct sipmsg *msg) {
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1044 gchar *from;
21100
814637ced463 Some constification, which also found and fixed some potential double-free
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21076
diff changeset
1045 const gchar *contenttype;
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1046 gboolean found = FALSE;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1047
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1048 from = parse_from(sipmsg_find_header(msg, "From"));
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1049
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1050 if(!from) return;
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
1051
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1052 purple_debug(PURPLE_DEBUG_MISC, "simple", "got message from %s: %s\n", from, msg->body);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1053
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1054 contenttype = sipmsg_find_header(msg, "Content-Type");
25603
d9748fa08309 This is a combination of patches from darkrain42 and Marcus Sundberg to fix
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 25206
diff changeset
1055 if(!contenttype || !strncmp(contenttype, "text/plain", 10) || !strncmp(contenttype, "text/html", 9)) {
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1056 serv_got_im(sip->gc, from, msg->body, 0, time(NULL));
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1057 send_sip_response(sip->gc, msg, 200, "OK", NULL);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1058 found = TRUE;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1059 }
25603
d9748fa08309 This is a combination of patches from darkrain42 and Marcus Sundberg to fix
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 25206
diff changeset
1060 else if(!strncmp(contenttype, "application/im-iscomposing+xml", 30)) {
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
1061 xmlnode *isc = xmlnode_from_str(msg->body, msg->bodylen);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1062 xmlnode *state;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1063 gchar *statedata;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1064
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1065 if(!isc) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1066 purple_debug_info("simple", "process_incoming_message: can not parse iscomposing\n");
18840
05aeff1821c4 Fix from Will Hawkins to plug some leaks in error cases for the SIMPLE prpl. References #2181.
Daniel Atallah <datallah@pidgin.im>
parents: 18552
diff changeset
1067 g_free(from);
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
1068 return;
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
1069 }
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1070
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
1071 state = xmlnode_get_child(isc, "state");
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1072
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
1073 if(!state) {
18840
05aeff1821c4 Fix from Will Hawkins to plug some leaks in error cases for the SIMPLE prpl. References #2181.
Daniel Atallah <datallah@pidgin.im>
parents: 18552
diff changeset
1074 purple_debug_info("simple", "process_incoming_message: no state found\n");
05aeff1821c4 Fix from Will Hawkins to plug some leaks in error cases for the SIMPLE prpl. References #2181.
Daniel Atallah <datallah@pidgin.im>
parents: 18552
diff changeset
1075 xmlnode_free(isc);
05aeff1821c4 Fix from Will Hawkins to plug some leaks in error cases for the SIMPLE prpl. References #2181.
Daniel Atallah <datallah@pidgin.im>
parents: 18552
diff changeset
1076 g_free(from);
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
1077 return;
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
1078 }
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1079
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
1080 statedata = xmlnode_get_data(state);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1081 if(statedata) {
24845
6418fb8799b8 Some cleanup. The headers are all NUL delimited, so we don't need to mess with
Daniel Atallah <datallah@pidgin.im>
parents: 24844
diff changeset
1082 if(strstr(statedata, "active"))
6418fb8799b8 Some cleanup. The headers are all NUL delimited, so we don't need to mess with
Daniel Atallah <datallah@pidgin.im>
parents: 24844
diff changeset
1083 serv_got_typing(sip->gc, from, 0, PURPLE_TYPING);
6418fb8799b8 Some cleanup. The headers are all NUL delimited, so we don't need to mess with
Daniel Atallah <datallah@pidgin.im>
parents: 24844
diff changeset
1084 else
6418fb8799b8 Some cleanup. The headers are all NUL delimited, so we don't need to mess with
Daniel Atallah <datallah@pidgin.im>
parents: 24844
diff changeset
1085 serv_got_typing_stopped(sip->gc, from);
14131
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
1086
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
1087 g_free(statedata);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1088 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1089 xmlnode_free(isc);
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
1090 send_sip_response(sip->gc, msg, 200, "OK", NULL);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1091 found = TRUE;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1092 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1093 if(!found) {
19832
84b69b21672b Patch from QuLogic. Fixes #2903 ('Missing newlines in debug messages.')
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 18840
diff changeset
1094 purple_debug_info("simple", "got unknown mime-type\n");
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1095 send_sip_response(sip->gc, msg, 415, "Unsupported media type", NULL);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1096 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1097 g_free(from);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1098 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1099
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1100
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1101 gboolean process_register_response(struct simple_account_data *sip, struct sipmsg *msg, struct transaction *tc) {
21100
814637ced463 Some constification, which also found and fixed some potential double-free
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21076
diff changeset
1102 const gchar *tmp;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1103 purple_debug(PURPLE_DEBUG_MISC, "simple", "in process register response response: %d\n", msg->response);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1104 switch (msg->response) {
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1105 case 200:
19991
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
1106 if(sip->registerstatus < SIMPLE_REGISTER_COMPLETE) { /* registered */
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1107 if(purple_account_get_bool(sip->account, "dopublish", TRUE)) {
20988
75eab0f2aa19 Patch from Will Hawkins to publish a status of closed when signing out of a SIMPLE account. Fixes #1914.
Daniel Atallah <datallah@pidgin.im>
parents: 20658
diff changeset
1108 send_open_publish(sip);
11345
48a2f93e47b6 [gaim-migrate @ 13562]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11341
diff changeset
1109 }
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1110 }
19991
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
1111 sip->registerstatus = SIMPLE_REGISTER_COMPLETE;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1112 purple_connection_set_state(sip->gc, PURPLE_CONNECTED);
11341
5511bbeeb3b4 [gaim-migrate @ 13555]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11327
diff changeset
1113
5511bbeeb3b4 [gaim-migrate @ 13555]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11327
diff changeset
1114 /* get buddies from blist */
5511bbeeb3b4 [gaim-migrate @ 13555]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11327
diff changeset
1115 simple_get_buddies(sip->gc);
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
1116
12768
0783fffbd552 [gaim-migrate @ 15115]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 12767
diff changeset
1117 subscribe_timeout(sip);
13348
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
1118 tmp = sipmsg_find_header(msg, "Allow-Events");
14131
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
1119 if(tmp && strstr(tmp, "vnd-microsoft-provisioning")){
13348
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
1120 simple_subscribe_buddylist(sip);
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
1121 }
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
1122
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1123 break;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1124 case 401:
19991
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
1125 if(sip->registerstatus != SIMPLE_REGISTER_RETRY) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1126 purple_debug_info("simple", "REGISTER retries %d\n", sip->registrar.retries);
19991
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
1127 if(sip->registrar.retries > SIMPLE_REGISTER_RETRY_MAX) {
20658
91594d39738c Clear the password consistently when we get a "Signed-On elsewhere" or a "Invalid Password" disconnection. Disconnection reason codes will take care of this in the core, but until then, this is ok. Fixes #3204.
Daniel Atallah <datallah@pidgin.im>
parents: 19991
diff changeset
1128 if (!purple_account_get_remember_password(sip->gc->account))
91594d39738c Clear the password consistently when we get a "Signed-On elsewhere" or a "Invalid Password" disconnection. Disconnection reason codes will take care of this in the core, but until then, this is ok. Fixes #3204.
Daniel Atallah <datallah@pidgin.im>
parents: 19991
diff changeset
1129 purple_account_set_password(sip->gc->account, NULL);
20459
db73082a228c Add disconnection reasons to SIMPLE.
Will Thompson <resiak@pidgin.im>
parents: 19991
diff changeset
1130 purple_connection_error_reason(sip->gc,
21279
40685e1f50ca Rename:
Will Thompson <resiak@pidgin.im>
parents: 21152
diff changeset
1131 PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED,
27635
0cd19038c417 More uniformity among disconnect error messages
Mark Doliner <markdoliner@pidgin.im>
parents: 27350
diff changeset
1132 _("Incorrect password"));
11346
4af1dc4b2c44 [gaim-migrate @ 13563]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11345
diff changeset
1133 return TRUE;
4af1dc4b2c44 [gaim-migrate @ 13563]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11345
diff changeset
1134 }
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1135 tmp = sipmsg_find_header(msg, "WWW-Authenticate");
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1136 fill_auth(sip, tmp, &sip->registrar);
19991
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
1137 sip->registerstatus = SIMPLE_REGISTER_RETRY;
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
1138 do_register(sip);
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
1139 }
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
1140 break;
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
1141 default:
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
1142 if (sip->registerstatus != SIMPLE_REGISTER_RETRY) {
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
1143 purple_debug_info("simple", "Unrecognized return code for REGISTER.\n");
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
1144 if (sip->registrar.retries > SIMPLE_REGISTER_RETRY_MAX) {
21279
40685e1f50ca Rename:
Will Thompson <resiak@pidgin.im>
parents: 21152
diff changeset
1145 purple_connection_error_reason(sip->gc,
40685e1f50ca Rename:
Will Thompson <resiak@pidgin.im>
parents: 21152
diff changeset
1146 PURPLE_CONNECTION_ERROR_OTHER_ERROR,
27635
0cd19038c417 More uniformity among disconnect error messages
Mark Doliner <markdoliner@pidgin.im>
parents: 27350
diff changeset
1147 _("Unknown server response"));
19991
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
1148 return TRUE;
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
1149 }
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
1150 sip->registerstatus = SIMPLE_REGISTER_RETRY;
11194
47dc0e9a757a [gaim-migrate @ 13317]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11192
diff changeset
1151 do_register(sip);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1152 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1153 break;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1154 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1155 return TRUE;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1156 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1157
21417
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1158 static gboolean dialog_match(struct sip_dialog *dialog, struct sipmsg *msg)
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1159 {
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1160 const gchar *fromhdr;
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1161 const gchar *tohdr;
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1162 const gchar *callid;
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1163 gchar *ourtag, *theirtag;
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1164 gboolean match = FALSE;
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1165
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1166 fromhdr = sipmsg_find_header(msg, "From");
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1167 tohdr = sipmsg_find_header(msg, "To");
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1168 callid = sipmsg_find_header(msg, "Call-ID");
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1169
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1170 if (!fromhdr || !tohdr || !callid)
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1171 return FALSE;
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1172
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1173 ourtag = find_tag(tohdr);
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1174 theirtag = find_tag(fromhdr);
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1175
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1176 if (ourtag && theirtag &&
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1177 !strcmp(dialog->callid, callid) &&
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1178 !strcmp(dialog->ourtag, ourtag) &&
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1179 !strcmp(dialog->theirtag, theirtag))
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1180 match = TRUE;
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1181
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1182 g_free(ourtag);
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1183 g_free(theirtag);
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1184
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1185 return match;
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1186 }
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1187
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1188 static void process_incoming_notify(struct simple_account_data *sip, struct sipmsg *msg) {
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1189 gchar *from;
21100
814637ced463 Some constification, which also found and fixed some potential double-free
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21076
diff changeset
1190 const gchar *fromhdr;
20989
5707d9d29718 Patch from Will Hawkins for some cleanup of the SIMPLE notify message processing. This should hopefully fix some cases when a user signs off but we don't notice. Fixes #3507.
Daniel Atallah <datallah@pidgin.im>
parents: 20988
diff changeset
1191 gchar *basicstatus_data;
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1192 xmlnode *pidf;
14132
2325b60d8b77 [gaim-migrate @ 16691]
Daniel Atallah <datallah@pidgin.im>
parents: 14131
diff changeset
1193 xmlnode *basicstatus = NULL, *tuple, *status;
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1194 gboolean isonline = FALSE;
21417
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1195 struct simple_buddy *b = NULL;
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1196 const gchar *sshdr = NULL;
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1197
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
1198 fromhdr = sipmsg_find_header(msg, "From");
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1199 from = parse_from(fromhdr);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1200 if(!from) return;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1201
21417
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1202 b = g_hash_table_lookup(sip->buddies, from);
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1203 if (!b)
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1204 {
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1205 g_free(from);
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1206 purple_debug_info("simple", "Could not find the buddy.\n");
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1207 return;
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1208 }
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1209
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1210 if (b->dialog && !dialog_match(b->dialog, msg))
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1211 {
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1212 /* We only accept notifies from people that
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1213 * we already have a dialog with.
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1214 */
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1215 purple_debug_info("simple","No corresponding dialog for notify--discard\n");
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1216 g_free(from);
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1217 return;
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1218 }
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1219
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1220 pidf = xmlnode_from_str(msg->body, msg->bodylen);
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
1221
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1222 if(!pidf) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1223 purple_debug_info("simple", "process_incoming_notify: no parseable pidf\n");
21417
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1224 sshdr = sipmsg_find_header(msg, "Subscription-State");
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1225 if (sshdr)
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1226 {
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1227 int i = 0;
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1228 gchar **ssparts = g_strsplit(sshdr, ":", 0);
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1229 while (ssparts[i])
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1230 {
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1231 g_strchug(ssparts[i]);
22634
faaadc2d74bb Use purple_str_has_prefix which provides backwards compatibility with older
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 22388
diff changeset
1232 if (purple_str_has_prefix(ssparts[i], "terminated"))
21417
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1233 {
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1234 purple_debug_info("simple", "Subscription expired!");
24638
b272153e8de5 Fix CID #370
Richard Laager <rlaager@pidgin.im>
parents: 24040
diff changeset
1235 if (b->dialog)
b272153e8de5 Fix CID #370
Richard Laager <rlaager@pidgin.im>
parents: 24040
diff changeset
1236 {
b272153e8de5 Fix CID #370
Richard Laager <rlaager@pidgin.im>
parents: 24040
diff changeset
1237 g_free(b->dialog->ourtag);
b272153e8de5 Fix CID #370
Richard Laager <rlaager@pidgin.im>
parents: 24040
diff changeset
1238 g_free(b->dialog->theirtag);
b272153e8de5 Fix CID #370
Richard Laager <rlaager@pidgin.im>
parents: 24040
diff changeset
1239 g_free(b->dialog->callid);
b272153e8de5 Fix CID #370
Richard Laager <rlaager@pidgin.im>
parents: 24040
diff changeset
1240 g_free(b->dialog);
b272153e8de5 Fix CID #370
Richard Laager <rlaager@pidgin.im>
parents: 24040
diff changeset
1241 b->dialog = NULL;
b272153e8de5 Fix CID #370
Richard Laager <rlaager@pidgin.im>
parents: 24040
diff changeset
1242 }
21417
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1243
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1244 purple_prpl_got_user_status(sip->account, from, "offline", NULL);
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1245 break;
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1246 }
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1247 i++;
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1248 }
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1249 g_strfreev(ssparts);
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1250 }
20989
5707d9d29718 Patch from Will Hawkins for some cleanup of the SIMPLE notify message processing. This should hopefully fix some cases when a user signs off but we don't notice. Fixes #3507.
Daniel Atallah <datallah@pidgin.im>
parents: 20988
diff changeset
1251 send_sip_response(sip->gc, msg, 200, "OK", NULL);
18840
05aeff1821c4 Fix from Will Hawkins to plug some leaks in error cases for the SIMPLE prpl. References #2181.
Daniel Atallah <datallah@pidgin.im>
parents: 18552
diff changeset
1252 g_free(from);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1253 return;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1254 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1255
14132
2325b60d8b77 [gaim-migrate @ 16691]
Daniel Atallah <datallah@pidgin.im>
parents: 14131
diff changeset
1256 if ((tuple = xmlnode_get_child(pidf, "tuple")))
2325b60d8b77 [gaim-migrate @ 16691]
Daniel Atallah <datallah@pidgin.im>
parents: 14131
diff changeset
1257 if ((status = xmlnode_get_child(tuple, "status")))
2325b60d8b77 [gaim-migrate @ 16691]
Daniel Atallah <datallah@pidgin.im>
parents: 14131
diff changeset
1258 basicstatus = xmlnode_get_child(status, "basic");
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1259
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1260 if(!basicstatus) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1261 purple_debug_info("simple", "process_incoming_notify: no basic found\n");
14132
2325b60d8b77 [gaim-migrate @ 16691]
Daniel Atallah <datallah@pidgin.im>
parents: 14131
diff changeset
1262 xmlnode_free(pidf);
18840
05aeff1821c4 Fix from Will Hawkins to plug some leaks in error cases for the SIMPLE prpl. References #2181.
Daniel Atallah <datallah@pidgin.im>
parents: 18552
diff changeset
1263 g_free(from);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1264 return;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1265 }
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
1266
20989
5707d9d29718 Patch from Will Hawkins for some cleanup of the SIMPLE notify message processing. This should hopefully fix some cases when a user signs off but we don't notice. Fixes #3507.
Daniel Atallah <datallah@pidgin.im>
parents: 20988
diff changeset
1267 basicstatus_data = xmlnode_get_data(basicstatus);
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
1268
20989
5707d9d29718 Patch from Will Hawkins for some cleanup of the SIMPLE notify message processing. This should hopefully fix some cases when a user signs off but we don't notice. Fixes #3507.
Daniel Atallah <datallah@pidgin.im>
parents: 20988
diff changeset
1269 if(!basicstatus_data) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1270 purple_debug_info("simple", "process_incoming_notify: no basic data found\n");
14132
2325b60d8b77 [gaim-migrate @ 16691]
Daniel Atallah <datallah@pidgin.im>
parents: 14131
diff changeset
1271 xmlnode_free(pidf);
18840
05aeff1821c4 Fix from Will Hawkins to plug some leaks in error cases for the SIMPLE prpl. References #2181.
Daniel Atallah <datallah@pidgin.im>
parents: 18552
diff changeset
1272 g_free(from);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1273 return;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1274 }
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
1275
20989
5707d9d29718 Patch from Will Hawkins for some cleanup of the SIMPLE notify message processing. This should hopefully fix some cases when a user signs off but we don't notice. Fixes #3507.
Daniel Atallah <datallah@pidgin.im>
parents: 20988
diff changeset
1276 if(strstr(basicstatus_data, "open"))
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1277 isonline = TRUE;
20989
5707d9d29718 Patch from Will Hawkins for some cleanup of the SIMPLE notify message processing. This should hopefully fix some cases when a user signs off but we don't notice. Fixes #3507.
Daniel Atallah <datallah@pidgin.im>
parents: 20988
diff changeset
1278
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1279
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 30138
diff changeset
1280 if(isonline)
20989
5707d9d29718 Patch from Will Hawkins for some cleanup of the SIMPLE notify message processing. This should hopefully fix some cases when a user signs off but we don't notice. Fixes #3507.
Daniel Atallah <datallah@pidgin.im>
parents: 20988
diff changeset
1281 purple_prpl_got_user_status(sip->account, from, "available", NULL);
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 30138
diff changeset
1282 else
20989
5707d9d29718 Patch from Will Hawkins for some cleanup of the SIMPLE notify message processing. This should hopefully fix some cases when a user signs off but we don't notice. Fixes #3507.
Daniel Atallah <datallah@pidgin.im>
parents: 20988
diff changeset
1283 purple_prpl_got_user_status(sip->account, from, "offline", NULL);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1284
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1285 xmlnode_free(pidf);
20989
5707d9d29718 Patch from Will Hawkins for some cleanup of the SIMPLE notify message processing. This should hopefully fix some cases when a user signs off but we don't notice. Fixes #3507.
Daniel Atallah <datallah@pidgin.im>
parents: 20988
diff changeset
1286 g_free(from);
5707d9d29718 Patch from Will Hawkins for some cleanup of the SIMPLE notify message processing. This should hopefully fix some cases when a user signs off but we don't notice. Fixes #3507.
Daniel Atallah <datallah@pidgin.im>
parents: 20988
diff changeset
1287 g_free(basicstatus_data);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1288
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1289 send_sip_response(sip->gc, msg, 200, "OK", NULL);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1290 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1291
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1292 static unsigned int simple_typing(PurpleConnection *gc, const char *name, PurpleTypingState state) {
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1293 struct simple_account_data *sip = gc->proto_data;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1294
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1295 gchar *xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1296 "<isComposing xmlns=\"urn:ietf:params:xml:ns:im-iscomposing\"\n"
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1297 "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1298 "xsi:schemaLocation=\"urn:ietf:params:xml:ns:im-composing iscomposing.xsd\">\n"
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1299 "<state>%s</state>\n"
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1300 "<contenttype>text/plain</contenttype>\n"
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1301 "<refresh>60</refresh>\n"
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1302 "</isComposing>";
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1303 gchar *recv = g_strdup(name);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1304 if(state == PURPLE_TYPING) {
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1305 gchar *msg = g_strdup_printf(xml, "active");
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1306 simple_send_message(sip, recv, msg, "application/im-iscomposing+xml");
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1307 g_free(msg);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1308 } else /* TODO: Only if (state == PURPLE_TYPED) ? */ {
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1309 gchar *msg = g_strdup_printf(xml, "idle");
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1310 simple_send_message(sip, recv, msg, "application/im-iscomposing+xml");
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1311 g_free(msg);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1312 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1313 g_free(recv);
13844
835b8f7b3d1d [gaim-migrate @ 16295]
Mark Doliner <markdoliner@pidgin.im>
parents: 13751
diff changeset
1314 /*
835b8f7b3d1d [gaim-migrate @ 16295]
Mark Doliner <markdoliner@pidgin.im>
parents: 13751
diff changeset
1315 * TODO: Is this right? It will cause the core to call
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1316 * serv_send_typing(gc, who, PURPLE_TYPING) once every second
13844
835b8f7b3d1d [gaim-migrate @ 16295]
Mark Doliner <markdoliner@pidgin.im>
parents: 13751
diff changeset
1317 * until the user stops typing. If that's not desired,
835b8f7b3d1d [gaim-migrate @ 16295]
Mark Doliner <markdoliner@pidgin.im>
parents: 13751
diff changeset
1318 * then return 0 instead.
835b8f7b3d1d [gaim-migrate @ 16295]
Mark Doliner <markdoliner@pidgin.im>
parents: 13751
diff changeset
1319 */
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1320 return 1;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1321 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1322
14131
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
1323 static gchar *find_tag(const gchar *hdr) {
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
1324 const gchar *tmp = strstr(hdr, ";tag="), *tmp2;
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
1325
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1326 if(!tmp) return NULL;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1327 tmp += 5;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1328 if((tmp2 = strchr(tmp, ';'))) {
14131
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
1329 return g_strndup(tmp, tmp2 - tmp);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1330 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1331 return g_strdup(tmp);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1332 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1333
13178
824d50326672 [gaim-migrate @ 15540]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13130
diff changeset
1334 static gchar* gen_xpidf(struct simple_account_data *sip) {
824d50326672 [gaim-migrate @ 15540]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13130
diff changeset
1335 gchar *doc = g_strdup_printf("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
824d50326672 [gaim-migrate @ 15540]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13130
diff changeset
1336 "<presence>\n"
824d50326672 [gaim-migrate @ 15540]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13130
diff changeset
1337 "<presentity uri=\"sip:%s@%s;method=SUBSCRIBE\"/>\n"
824d50326672 [gaim-migrate @ 15540]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13130
diff changeset
1338 "<display name=\"sip:%s@%s\"/>\n"
824d50326672 [gaim-migrate @ 15540]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13130
diff changeset
1339 "<atom id=\"1234\">\n"
824d50326672 [gaim-migrate @ 15540]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13130
diff changeset
1340 "<address uri=\"sip:%s@%s\">\n"
824d50326672 [gaim-migrate @ 15540]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13130
diff changeset
1341 "<status status=\"%s\"/>\n"
824d50326672 [gaim-migrate @ 15540]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13130
diff changeset
1342 "</address>\n"
824d50326672 [gaim-migrate @ 15540]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13130
diff changeset
1343 "</atom>\n"
824d50326672 [gaim-migrate @ 15540]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13130
diff changeset
1344 "</presence>\n",
824d50326672 [gaim-migrate @ 15540]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13130
diff changeset
1345 sip->username,
824d50326672 [gaim-migrate @ 15540]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13130
diff changeset
1346 sip->servername,
824d50326672 [gaim-migrate @ 15540]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13130
diff changeset
1347 sip->username,
824d50326672 [gaim-migrate @ 15540]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13130
diff changeset
1348 sip->servername,
824d50326672 [gaim-migrate @ 15540]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13130
diff changeset
1349 sip->username,
824d50326672 [gaim-migrate @ 15540]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13130
diff changeset
1350 sip->servername,
824d50326672 [gaim-migrate @ 15540]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13130
diff changeset
1351 sip->status);
824d50326672 [gaim-migrate @ 15540]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13130
diff changeset
1352 return doc;
824d50326672 [gaim-migrate @ 15540]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13130
diff changeset
1353 }
824d50326672 [gaim-migrate @ 15540]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13130
diff changeset
1354
20988
75eab0f2aa19 Patch from Will Hawkins to publish a status of closed when signing out of a SIMPLE account. Fixes #1914.
Daniel Atallah <datallah@pidgin.im>
parents: 20658
diff changeset
1355 static gchar* gen_pidf(struct simple_account_data *sip, gboolean open) {
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1356 gchar *doc = g_strdup_printf("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
1357 "<presence xmlns=\"urn:ietf:params:xml:ns:pidf\"\n"
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
1358 "xmlns:im=\"urn:ietf:params:xml:ns:pidf:im\"\n"
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
1359 "entity=\"sip:%s@%s\">\n"
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
1360 "<tuple id=\"bs35r9f\">\n"
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1361 "<status>\n"
20988
75eab0f2aa19 Patch from Will Hawkins to publish a status of closed when signing out of a SIMPLE account. Fixes #1914.
Daniel Atallah <datallah@pidgin.im>
parents: 20658
diff changeset
1362 "<basic>%s</basic>\n"
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1363 "</status>\n"
13656
32db312f1b9c [gaim-migrate @ 16057]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13581
diff changeset
1364 "<note>%s</note>\n"
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1365 "</tuple>\n"
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1366 "</presence>",
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1367 sip->username,
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1368 sip->servername,
20988
75eab0f2aa19 Patch from Will Hawkins to publish a status of closed when signing out of a SIMPLE account. Fixes #1914.
Daniel Atallah <datallah@pidgin.im>
parents: 20658
diff changeset
1369 (open == TRUE) ? "open" : "closed",
75eab0f2aa19 Patch from Will Hawkins to publish a status of closed when signing out of a SIMPLE account. Fixes #1914.
Daniel Atallah <datallah@pidgin.im>
parents: 20658
diff changeset
1370 (open == TRUE) ? sip->status : "");
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1371 return doc;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1372 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1373
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1374 static void send_notify(struct simple_account_data *sip, struct simple_watcher *watcher) {
20988
75eab0f2aa19 Patch from Will Hawkins to publish a status of closed when signing out of a SIMPLE account. Fixes #1914.
Daniel Atallah <datallah@pidgin.im>
parents: 20658
diff changeset
1375 gchar *doc = watcher->needsxpidf ? gen_xpidf(sip) : gen_pidf(sip, TRUE);
13178
824d50326672 [gaim-migrate @ 15540]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13130
diff changeset
1376 gchar *hdr = watcher->needsxpidf ? "Event: presence\r\nContent-Type: application/xpidf+xml\r\n" : "Event: presence\r\nContent-Type: application/pidf+xml\r\n";
824d50326672 [gaim-migrate @ 15540]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13130
diff changeset
1377 send_sip_request(sip->gc, "NOTIFY", watcher->name, watcher->name, hdr, doc, &watcher->dialog, NULL);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1378 g_free(doc);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1379 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1380
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1381 static gboolean process_publish_response(struct simple_account_data *sip, struct sipmsg *msg, struct transaction *tc) {
22182
0a0d7e312397 Patch from Will Hawkins to implement sending a SIP-If-Match header on subsequent PUBLISHes after receiving a SIP-Etag header. I made some minor tweaks to this, hopefully I didn't break anything. Fixes #4422.
Daniel Atallah <datallah@pidgin.im>
parents: 22104
diff changeset
1382
0a0d7e312397 Patch from Will Hawkins to implement sending a SIP-If-Match header on subsequent PUBLISHes after receiving a SIP-Etag header. I made some minor tweaks to this, hopefully I didn't break anything. Fixes #4422.
Daniel Atallah <datallah@pidgin.im>
parents: 22104
diff changeset
1383 const gchar *etag = NULL;
0a0d7e312397 Patch from Will Hawkins to implement sending a SIP-If-Match header on subsequent PUBLISHes after receiving a SIP-Etag header. I made some minor tweaks to this, hopefully I didn't break anything. Fixes #4422.
Daniel Atallah <datallah@pidgin.im>
parents: 22104
diff changeset
1384
11345
48a2f93e47b6 [gaim-migrate @ 13562]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11341
diff changeset
1385 if(msg->response != 200 && msg->response != 408) {
11341
5511bbeeb3b4 [gaim-migrate @ 13555]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11327
diff changeset
1386 /* never send again */
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1387 sip->republish = -1;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1388 }
22182
0a0d7e312397 Patch from Will Hawkins to implement sending a SIP-If-Match header on subsequent PUBLISHes after receiving a SIP-Etag header. I made some minor tweaks to this, hopefully I didn't break anything. Fixes #4422.
Daniel Atallah <datallah@pidgin.im>
parents: 22104
diff changeset
1389
0a0d7e312397 Patch from Will Hawkins to implement sending a SIP-If-Match header on subsequent PUBLISHes after receiving a SIP-Etag header. I made some minor tweaks to this, hopefully I didn't break anything. Fixes #4422.
Daniel Atallah <datallah@pidgin.im>
parents: 22104
diff changeset
1390 etag = sipmsg_find_header(msg, "SIP-Etag");
0a0d7e312397 Patch from Will Hawkins to implement sending a SIP-If-Match header on subsequent PUBLISHes after receiving a SIP-Etag header. I made some minor tweaks to this, hopefully I didn't break anything. Fixes #4422.
Daniel Atallah <datallah@pidgin.im>
parents: 22104
diff changeset
1391 if (etag) {
0a0d7e312397 Patch from Will Hawkins to implement sending a SIP-If-Match header on subsequent PUBLISHes after receiving a SIP-Etag header. I made some minor tweaks to this, hopefully I didn't break anything. Fixes #4422.
Daniel Atallah <datallah@pidgin.im>
parents: 22104
diff changeset
1392 /* we must store the etag somewhere. */
0a0d7e312397 Patch from Will Hawkins to implement sending a SIP-If-Match header on subsequent PUBLISHes after receiving a SIP-Etag header. I made some minor tweaks to this, hopefully I didn't break anything. Fixes #4422.
Daniel Atallah <datallah@pidgin.im>
parents: 22104
diff changeset
1393 g_free(sip->publish_etag);
0a0d7e312397 Patch from Will Hawkins to implement sending a SIP-If-Match header on subsequent PUBLISHes after receiving a SIP-Etag header. I made some minor tweaks to this, hopefully I didn't break anything. Fixes #4422.
Daniel Atallah <datallah@pidgin.im>
parents: 22104
diff changeset
1394 sip->publish_etag = g_strdup(etag);
0a0d7e312397 Patch from Will Hawkins to implement sending a SIP-If-Match header on subsequent PUBLISHes after receiving a SIP-Etag header. I made some minor tweaks to this, hopefully I didn't break anything. Fixes #4422.
Daniel Atallah <datallah@pidgin.im>
parents: 22104
diff changeset
1395 }
0a0d7e312397 Patch from Will Hawkins to implement sending a SIP-If-Match header on subsequent PUBLISHes after receiving a SIP-Etag header. I made some minor tweaks to this, hopefully I didn't break anything. Fixes #4422.
Daniel Atallah <datallah@pidgin.im>
parents: 22104
diff changeset
1396
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1397 return TRUE;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1398 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1399
20988
75eab0f2aa19 Patch from Will Hawkins to publish a status of closed when signing out of a SIMPLE account. Fixes #1914.
Daniel Atallah <datallah@pidgin.im>
parents: 20658
diff changeset
1400 static void send_open_publish(struct simple_account_data *sip) {
21417
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1401 gchar *add_headers = NULL;
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1402 gchar *uri = g_strdup_printf("sip:%s@%s", sip->username, sip->servername);
20988
75eab0f2aa19 Patch from Will Hawkins to publish a status of closed when signing out of a SIMPLE account. Fixes #1914.
Daniel Atallah <datallah@pidgin.im>
parents: 20658
diff changeset
1403 gchar *doc = gen_pidf(sip, TRUE);
21417
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1404
22182
0a0d7e312397 Patch from Will Hawkins to implement sending a SIP-If-Match header on subsequent PUBLISHes after receiving a SIP-Etag header. I made some minor tweaks to this, hopefully I didn't break anything. Fixes #4422.
Daniel Atallah <datallah@pidgin.im>
parents: 22104
diff changeset
1405 add_headers = g_strdup_printf("%s%s%s%s%d\r\n%s",
0a0d7e312397 Patch from Will Hawkins to implement sending a SIP-If-Match header on subsequent PUBLISHes after receiving a SIP-Etag header. I made some minor tweaks to this, hopefully I didn't break anything. Fixes #4422.
Daniel Atallah <datallah@pidgin.im>
parents: 22104
diff changeset
1406 sip->publish_etag ? "SIP-If-Match: " : "",
0a0d7e312397 Patch from Will Hawkins to implement sending a SIP-If-Match header on subsequent PUBLISHes after receiving a SIP-Etag header. I made some minor tweaks to this, hopefully I didn't break anything. Fixes #4422.
Daniel Atallah <datallah@pidgin.im>
parents: 22104
diff changeset
1407 sip->publish_etag ? sip->publish_etag : "",
0a0d7e312397 Patch from Will Hawkins to implement sending a SIP-If-Match header on subsequent PUBLISHes after receiving a SIP-Etag header. I made some minor tweaks to this, hopefully I didn't break anything. Fixes #4422.
Daniel Atallah <datallah@pidgin.im>
parents: 22104
diff changeset
1408 sip->publish_etag ? "\r\n" : "",
0a0d7e312397 Patch from Will Hawkins to implement sending a SIP-If-Match header on subsequent PUBLISHes after receiving a SIP-Etag header. I made some minor tweaks to this, hopefully I didn't break anything. Fixes #4422.
Daniel Atallah <datallah@pidgin.im>
parents: 22104
diff changeset
1409 "Expires: ", PUBLISH_EXPIRATION,
0a0d7e312397 Patch from Will Hawkins to implement sending a SIP-If-Match header on subsequent PUBLISHes after receiving a SIP-Etag header. I made some minor tweaks to this, hopefully I didn't break anything. Fixes #4422.
Daniel Atallah <datallah@pidgin.im>
parents: 22104
diff changeset
1410 "Event: presence\r\n"
21417
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1411 "Content-Type: application/pidf+xml\r\n");
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1412
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
1413 send_sip_request(sip->gc, "PUBLISH", uri, uri,
21417
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1414 add_headers, doc, NULL, process_publish_response);
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1415 sip->republish = time(NULL) + PUBLISH_EXPIRATION - 50;
14131
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
1416 g_free(uri);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1417 g_free(doc);
21417
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1418 g_free(add_headers);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1419 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1420
20988
75eab0f2aa19 Patch from Will Hawkins to publish a status of closed when signing out of a SIMPLE account. Fixes #1914.
Daniel Atallah <datallah@pidgin.im>
parents: 20658
diff changeset
1421 static void send_closed_publish(struct simple_account_data *sip) {
75eab0f2aa19 Patch from Will Hawkins to publish a status of closed when signing out of a SIMPLE account. Fixes #1914.
Daniel Atallah <datallah@pidgin.im>
parents: 20658
diff changeset
1422 gchar *uri = g_strdup_printf("sip:%s@%s", sip->username, sip->servername);
22182
0a0d7e312397 Patch from Will Hawkins to implement sending a SIP-If-Match header on subsequent PUBLISHes after receiving a SIP-Etag header. I made some minor tweaks to this, hopefully I didn't break anything. Fixes #4422.
Daniel Atallah <datallah@pidgin.im>
parents: 22104
diff changeset
1423 gchar *add_headers, *doc;
0a0d7e312397 Patch from Will Hawkins to implement sending a SIP-If-Match header on subsequent PUBLISHes after receiving a SIP-Etag header. I made some minor tweaks to this, hopefully I didn't break anything. Fixes #4422.
Daniel Atallah <datallah@pidgin.im>
parents: 22104
diff changeset
1424
0a0d7e312397 Patch from Will Hawkins to implement sending a SIP-If-Match header on subsequent PUBLISHes after receiving a SIP-Etag header. I made some minor tweaks to this, hopefully I didn't break anything. Fixes #4422.
Daniel Atallah <datallah@pidgin.im>
parents: 22104
diff changeset
1425 add_headers = g_strdup_printf("%s%s%s%s",
0a0d7e312397 Patch from Will Hawkins to implement sending a SIP-If-Match header on subsequent PUBLISHes after receiving a SIP-Etag header. I made some minor tweaks to this, hopefully I didn't break anything. Fixes #4422.
Daniel Atallah <datallah@pidgin.im>
parents: 22104
diff changeset
1426 sip->publish_etag ? "SIP-If-Match: " : "",
0a0d7e312397 Patch from Will Hawkins to implement sending a SIP-If-Match header on subsequent PUBLISHes after receiving a SIP-Etag header. I made some minor tweaks to this, hopefully I didn't break anything. Fixes #4422.
Daniel Atallah <datallah@pidgin.im>
parents: 22104
diff changeset
1427 sip->publish_etag ? sip->publish_etag : "",
0a0d7e312397 Patch from Will Hawkins to implement sending a SIP-If-Match header on subsequent PUBLISHes after receiving a SIP-Etag header. I made some minor tweaks to this, hopefully I didn't break anything. Fixes #4422.
Daniel Atallah <datallah@pidgin.im>
parents: 22104
diff changeset
1428 sip->publish_etag ? "\r\n" : "",
0a0d7e312397 Patch from Will Hawkins to implement sending a SIP-If-Match header on subsequent PUBLISHes after receiving a SIP-Etag header. I made some minor tweaks to this, hopefully I didn't break anything. Fixes #4422.
Daniel Atallah <datallah@pidgin.im>
parents: 22104
diff changeset
1429 "Expires: 600\r\n"
0a0d7e312397 Patch from Will Hawkins to implement sending a SIP-If-Match header on subsequent PUBLISHes after receiving a SIP-Etag header. I made some minor tweaks to this, hopefully I didn't break anything. Fixes #4422.
Daniel Atallah <datallah@pidgin.im>
parents: 22104
diff changeset
1430 "Event: presence\r\n"
0a0d7e312397 Patch from Will Hawkins to implement sending a SIP-If-Match header on subsequent PUBLISHes after receiving a SIP-Etag header. I made some minor tweaks to this, hopefully I didn't break anything. Fixes #4422.
Daniel Atallah <datallah@pidgin.im>
parents: 22104
diff changeset
1431 "Content-Type: application/pidf+xml\r\n");
0a0d7e312397 Patch from Will Hawkins to implement sending a SIP-If-Match header on subsequent PUBLISHes after receiving a SIP-Etag header. I made some minor tweaks to this, hopefully I didn't break anything. Fixes #4422.
Daniel Atallah <datallah@pidgin.im>
parents: 22104
diff changeset
1432
0a0d7e312397 Patch from Will Hawkins to implement sending a SIP-If-Match header on subsequent PUBLISHes after receiving a SIP-Etag header. I made some minor tweaks to this, hopefully I didn't break anything. Fixes #4422.
Daniel Atallah <datallah@pidgin.im>
parents: 22104
diff changeset
1433 doc = gen_pidf(sip, FALSE);
0a0d7e312397 Patch from Will Hawkins to implement sending a SIP-If-Match header on subsequent PUBLISHes after receiving a SIP-Etag header. I made some minor tweaks to this, hopefully I didn't break anything. Fixes #4422.
Daniel Atallah <datallah@pidgin.im>
parents: 22104
diff changeset
1434 send_sip_request(sip->gc, "PUBLISH", uri, uri, add_headers,
20988
75eab0f2aa19 Patch from Will Hawkins to publish a status of closed when signing out of a SIMPLE account. Fixes #1914.
Daniel Atallah <datallah@pidgin.im>
parents: 20658
diff changeset
1435 doc, NULL, process_publish_response);
75eab0f2aa19 Patch from Will Hawkins to publish a status of closed when signing out of a SIMPLE account. Fixes #1914.
Daniel Atallah <datallah@pidgin.im>
parents: 20658
diff changeset
1436 /*sip->republish = time(NULL) + 500;*/
75eab0f2aa19 Patch from Will Hawkins to publish a status of closed when signing out of a SIMPLE account. Fixes #1914.
Daniel Atallah <datallah@pidgin.im>
parents: 20658
diff changeset
1437 g_free(uri);
75eab0f2aa19 Patch from Will Hawkins to publish a status of closed when signing out of a SIMPLE account. Fixes #1914.
Daniel Atallah <datallah@pidgin.im>
parents: 20658
diff changeset
1438 g_free(doc);
22182
0a0d7e312397 Patch from Will Hawkins to implement sending a SIP-If-Match header on subsequent PUBLISHes after receiving a SIP-Etag header. I made some minor tweaks to this, hopefully I didn't break anything. Fixes #4422.
Daniel Atallah <datallah@pidgin.im>
parents: 22104
diff changeset
1439 g_free(add_headers);
20988
75eab0f2aa19 Patch from Will Hawkins to publish a status of closed when signing out of a SIMPLE account. Fixes #1914.
Daniel Atallah <datallah@pidgin.im>
parents: 20658
diff changeset
1440 }
75eab0f2aa19 Patch from Will Hawkins to publish a status of closed when signing out of a SIMPLE account. Fixes #1914.
Daniel Atallah <datallah@pidgin.im>
parents: 20658
diff changeset
1441
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1442 static void process_incoming_subscribe(struct simple_account_data *sip, struct sipmsg *msg) {
14131
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
1443 const char *from_hdr = sipmsg_find_header(msg, "From");
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
1444 gchar *from = parse_from(from_hdr);
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
1445 gchar *theirtag = find_tag(from_hdr);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1446 gchar *ourtag = find_tag(sipmsg_find_header(msg, "To"));
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1447 gboolean tagadded = FALSE;
21100
814637ced463 Some constification, which also found and fixed some potential double-free
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21076
diff changeset
1448 const gchar *callid = sipmsg_find_header(msg, "Call-ID");
814637ced463 Some constification, which also found and fixed some potential double-free
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21076
diff changeset
1449 const gchar *expire = sipmsg_find_header(msg, "Expire");
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1450 gchar *tmp;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1451 struct simple_watcher *watcher = watcher_find(sip, from);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1452 if(!ourtag) {
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1453 tagadded = TRUE;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1454 ourtag = gentag();
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1455 }
11341
5511bbeeb3b4 [gaim-migrate @ 13555]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11327
diff changeset
1456 if(!watcher) { /* new subscription */
21100
814637ced463 Some constification, which also found and fixed some potential double-free
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21076
diff changeset
1457 const gchar *acceptheader = sipmsg_find_header(msg, "Accept");
14131
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
1458 gboolean needsxpidf = FALSE;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1459 if(!purple_privacy_check(sip->account, from)) {
11345
48a2f93e47b6 [gaim-migrate @ 13562]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11341
diff changeset
1460 send_sip_response(sip->gc, msg, 202, "Ok", NULL);
48a2f93e47b6 [gaim-migrate @ 13562]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11341
diff changeset
1461 goto privend;
48a2f93e47b6 [gaim-migrate @ 13562]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11341
diff changeset
1462 }
13178
824d50326672 [gaim-migrate @ 15540]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13130
diff changeset
1463 if(acceptheader) {
21100
814637ced463 Some constification, which also found and fixed some potential double-free
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21076
diff changeset
1464 const gchar *tmp = acceptheader;
14132
2325b60d8b77 [gaim-migrate @ 16691]
Daniel Atallah <datallah@pidgin.im>
parents: 14131
diff changeset
1465 gboolean foundpidf = FALSE;
2325b60d8b77 [gaim-migrate @ 16691]
Daniel Atallah <datallah@pidgin.im>
parents: 14131
diff changeset
1466 gboolean foundxpidf = FALSE;
13178
824d50326672 [gaim-migrate @ 15540]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13130
diff changeset
1467 while(tmp && tmp < acceptheader + strlen(acceptheader)) {
824d50326672 [gaim-migrate @ 15540]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13130
diff changeset
1468 gchar *tmp2 = strchr(tmp, ',');
824d50326672 [gaim-migrate @ 15540]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13130
diff changeset
1469 if(tmp2) *tmp2 = '\0';
17155
143ff2796376 Replace strcasecmp() calls with glib equivalents.
Richard Laager <rlaager@pidgin.im>
parents: 16746
diff changeset
1470 if(!g_ascii_strcasecmp("application/pidf+xml", tmp))
14132
2325b60d8b77 [gaim-migrate @ 16691]
Daniel Atallah <datallah@pidgin.im>
parents: 14131
diff changeset
1471 foundpidf = TRUE;
17155
143ff2796376 Replace strcasecmp() calls with glib equivalents.
Richard Laager <rlaager@pidgin.im>
parents: 16746
diff changeset
1472 if(!g_ascii_strcasecmp("application/xpidf+xml", tmp))
14132
2325b60d8b77 [gaim-migrate @ 16691]
Daniel Atallah <datallah@pidgin.im>
parents: 14131
diff changeset
1473 foundxpidf = TRUE;
13178
824d50326672 [gaim-migrate @ 15540]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13130
diff changeset
1474 if(tmp2) {
824d50326672 [gaim-migrate @ 15540]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13130
diff changeset
1475 *tmp2 = ',';
17653
a71ca6b486a0 Fix a freeze caused by improper SIMPLE message parsing. Thanks, Michal Matyska! Fixes #1037
Sean Egan <seanegan@pidgin.im>
parents: 17226
diff changeset
1476 tmp = tmp2 + 1;
13178
824d50326672 [gaim-migrate @ 15540]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13130
diff changeset
1477 while(*tmp == ' ') tmp++;
824d50326672 [gaim-migrate @ 15540]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13130
diff changeset
1478 } else
824d50326672 [gaim-migrate @ 15540]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13130
diff changeset
1479 tmp = 0;
824d50326672 [gaim-migrate @ 15540]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13130
diff changeset
1480 }
14131
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
1481 if(!foundpidf && foundxpidf) needsxpidf = TRUE;
13178
824d50326672 [gaim-migrate @ 15540]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13130
diff changeset
1482 }
824d50326672 [gaim-migrate @ 15540]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13130
diff changeset
1483 watcher = watcher_create(sip, from, callid, ourtag, theirtag, needsxpidf);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1484 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1485 if(tagadded) {
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1486 gchar *to = g_strdup_printf("%s;tag=%s", sipmsg_find_header(msg, "To"), ourtag);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1487 sipmsg_remove_header(msg, "To");
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1488 sipmsg_add_header(msg, "To", to);
14131
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
1489 g_free(to);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1490 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1491 if(expire)
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1492 watcher->expire = time(NULL) + strtol(expire, NULL, 10);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1493 else
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1494 watcher->expire = time(NULL) + 600;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1495 sipmsg_remove_header(msg, "Contact");
13178
824d50326672 [gaim-migrate @ 15540]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13130
diff changeset
1496 tmp = get_contact(sip);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1497 sipmsg_add_header(msg, "Contact", tmp);
13178
824d50326672 [gaim-migrate @ 15540]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13130
diff changeset
1498 g_free(tmp);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1499 purple_debug_info("simple", "got subscribe: name %s ourtag %s theirtag %s callid %s\n", watcher->name, watcher->dialog.ourtag, watcher->dialog.theirtag, watcher->dialog.callid);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1500 send_sip_response(sip->gc, msg, 200, "Ok", NULL);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1501 send_notify(sip, watcher);
11345
48a2f93e47b6 [gaim-migrate @ 13562]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11341
diff changeset
1502 privend:
48a2f93e47b6 [gaim-migrate @ 13562]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11341
diff changeset
1503 g_free(from);
48a2f93e47b6 [gaim-migrate @ 13562]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11341
diff changeset
1504 g_free(theirtag);
48a2f93e47b6 [gaim-migrate @ 13562]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11341
diff changeset
1505 g_free(ourtag);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1506 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1507
11189
5ac07336091e [gaim-migrate @ 13307]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11181
diff changeset
1508 static void process_input_message(struct simple_account_data *sip, struct sipmsg *msg) {
12745
1dc3525647c2 [gaim-migrate @ 15092]
Daniel Atallah <datallah@pidgin.im>
parents: 12741
diff changeset
1509 gboolean found = FALSE;
1dc3525647c2 [gaim-migrate @ 15092]
Daniel Atallah <datallah@pidgin.im>
parents: 12741
diff changeset
1510 if(msg->response == 0) { /* request */
11189
5ac07336091e [gaim-migrate @ 13307]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11181
diff changeset
1511 if(!strcmp(msg->method, "MESSAGE")) {
5ac07336091e [gaim-migrate @ 13307]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11181
diff changeset
1512 process_incoming_message(sip, msg);
12745
1dc3525647c2 [gaim-migrate @ 15092]
Daniel Atallah <datallah@pidgin.im>
parents: 12741
diff changeset
1513 found = TRUE;
1dc3525647c2 [gaim-migrate @ 15092]
Daniel Atallah <datallah@pidgin.im>
parents: 12741
diff changeset
1514 } else if(!strcmp(msg->method, "NOTIFY")) {
11189
5ac07336091e [gaim-migrate @ 13307]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11181
diff changeset
1515 process_incoming_notify(sip, msg);
12745
1dc3525647c2 [gaim-migrate @ 15092]
Daniel Atallah <datallah@pidgin.im>
parents: 12741
diff changeset
1516 found = TRUE;
1dc3525647c2 [gaim-migrate @ 15092]
Daniel Atallah <datallah@pidgin.im>
parents: 12741
diff changeset
1517 } else if(!strcmp(msg->method, "SUBSCRIBE")) {
11189
5ac07336091e [gaim-migrate @ 13307]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11181
diff changeset
1518 process_incoming_subscribe(sip, msg);
12745
1dc3525647c2 [gaim-migrate @ 15092]
Daniel Atallah <datallah@pidgin.im>
parents: 12741
diff changeset
1519 found = TRUE;
1dc3525647c2 [gaim-migrate @ 15092]
Daniel Atallah <datallah@pidgin.im>
parents: 12741
diff changeset
1520 } else {
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
1521 send_sip_response(sip->gc, msg, 501, "Not implemented", NULL);
11190
16f02ac58a38 [gaim-migrate @ 13308]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11189
diff changeset
1522 }
11341
5511bbeeb3b4 [gaim-migrate @ 13555]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11327
diff changeset
1523 } else { /* response */
11189
5ac07336091e [gaim-migrate @ 13307]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11181
diff changeset
1524 struct transaction *trans = transactions_find(sip, msg);
5ac07336091e [gaim-migrate @ 13307]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11181
diff changeset
1525 if(trans) {
5ac07336091e [gaim-migrate @ 13307]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11181
diff changeset
1526 if(msg->response == 407) {
21100
814637ced463 Some constification, which also found and fixed some potential double-free
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21076
diff changeset
1527 gchar *resend, *auth;
814637ced463 Some constification, which also found and fixed some potential double-free
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21076
diff changeset
1528 const gchar *ptmp;
11439
e76bc2f9deb0 [gaim-migrate @ 13676]
Daniel Atallah <datallah@pidgin.im>
parents: 11424
diff changeset
1529
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
1530 if(sip->proxy.retries > 3) return;
11346
4af1dc4b2c44 [gaim-migrate @ 13563]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11345
diff changeset
1531 sip->proxy.retries++;
11341
5511bbeeb3b4 [gaim-migrate @ 13555]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11327
diff changeset
1532 /* do proxy authentication */
11189
5ac07336091e [gaim-migrate @ 13307]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11181
diff changeset
1533
11439
e76bc2f9deb0 [gaim-migrate @ 13676]
Daniel Atallah <datallah@pidgin.im>
parents: 11424
diff changeset
1534 ptmp = sipmsg_find_header(msg, "Proxy-Authenticate");
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
1535
11189
5ac07336091e [gaim-migrate @ 13307]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11181
diff changeset
1536 fill_auth(sip, ptmp, &sip->proxy);
11346
4af1dc4b2c44 [gaim-migrate @ 13563]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11345
diff changeset
1537 auth = auth_header(sip, &sip->proxy, trans->msg->method, trans->msg->target);
13273
68a4ff81c348 [gaim-migrate @ 15638]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13201
diff changeset
1538 sipmsg_remove_header(trans->msg, "Proxy-Authorization");
11189
5ac07336091e [gaim-migrate @ 13307]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11181
diff changeset
1539 sipmsg_add_header(trans->msg, "Proxy-Authorization", auth);
5ac07336091e [gaim-migrate @ 13307]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11181
diff changeset
1540 g_free(auth);
5ac07336091e [gaim-migrate @ 13307]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11181
diff changeset
1541 resend = sipmsg_to_string(trans->msg);
11341
5511bbeeb3b4 [gaim-migrate @ 13555]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11327
diff changeset
1542 /* resend request */
11189
5ac07336091e [gaim-migrate @ 13307]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11181
diff changeset
1543 sendout_pkt(sip->gc, resend);
5ac07336091e [gaim-migrate @ 13307]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11181
diff changeset
1544 g_free(resend);
5ac07336091e [gaim-migrate @ 13307]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11181
diff changeset
1545 } else {
11517
a3d6d136b7dd [gaim-migrate @ 13762]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11483
diff changeset
1546 if(msg->response == 100) {
a3d6d136b7dd [gaim-migrate @ 13762]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11483
diff changeset
1547 /* ignore provisional response */
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1548 purple_debug_info("simple", "got trying response\n");
11517
a3d6d136b7dd [gaim-migrate @ 13762]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11483
diff changeset
1549 } else {
a3d6d136b7dd [gaim-migrate @ 13762]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11483
diff changeset
1550 sip->proxy.retries = 0;
14131
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
1551 if(!strcmp(trans->msg->method, "REGISTER")) {
19991
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
1552
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
1553 /* This is encountered when a REGISTER request was ...
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
1554 */
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
1555 if(msg->response == 401) {
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
1556 /* denied until further authentication was provided. */
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
1557 sip->registrar.retries++;
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
1558 }
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
1559 else if (msg->response != 200) {
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
1560 /* denied for some other reason! */
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
1561 sip->registrar.retries++;
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
1562 }
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
1563 else {
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
1564 /* accepted! */
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
1565 sip->registrar.retries = 0;
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
1566 }
13348
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
1567 } else {
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
1568 if(msg->response == 401) {
19991
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
1569 /* This is encountered when a generic (MESSAGE, NOTIFY, etc)
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
1570 * was denied until further authorization is provided.
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
1571 */
21100
814637ced463 Some constification, which also found and fixed some potential double-free
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21076
diff changeset
1572 gchar *resend, *auth;
814637ced463 Some constification, which also found and fixed some potential double-free
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21076
diff changeset
1573 const gchar *ptmp;
13348
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
1574
19991
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
1575 if(sip->registrar.retries > SIMPLE_REGISTER_RETRY_MAX) return;
13348
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
1576 sip->registrar.retries++;
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
1577
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
1578 ptmp = sipmsg_find_header(msg, "WWW-Authenticate");
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
1579
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
1580 fill_auth(sip, ptmp, &sip->registrar);
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
1581 auth = auth_header(sip, &sip->registrar, trans->msg->method, trans->msg->target);
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
1582 sipmsg_remove_header(trans->msg, "Authorization");
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
1583 sipmsg_add_header(trans->msg, "Authorization", auth);
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
1584 g_free(auth);
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
1585 resend = sipmsg_to_string(trans->msg);
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
1586 /* resend request */
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
1587 sendout_pkt(sip->gc, resend);
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
1588 g_free(resend);
19991
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
1589 } else {
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
1590 /* Reset any count of retries that may have
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
1591 * accumulated in the above branch.
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
1592 */
603d11d2afa7 Fixes #3051 Patch from Will Hawkins to clean up SIMPLE login and registration
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
1593 sip->registrar.retries = 0;
13348
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
1594 }
1fe9d587d705 [gaim-migrate @ 15717]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13297
diff changeset
1595 }
11517
a3d6d136b7dd [gaim-migrate @ 13762]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11483
diff changeset
1596 if(trans->callback) {
a3d6d136b7dd [gaim-migrate @ 13762]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11483
diff changeset
1597 /* call the callback to process response*/
a3d6d136b7dd [gaim-migrate @ 13762]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11483
diff changeset
1598 (trans->callback)(sip, msg, trans);
a3d6d136b7dd [gaim-migrate @ 13762]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11483
diff changeset
1599 }
a3d6d136b7dd [gaim-migrate @ 13762]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11483
diff changeset
1600 transactions_remove(sip, trans);
11189
5ac07336091e [gaim-migrate @ 13307]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11181
diff changeset
1601 }
5ac07336091e [gaim-migrate @ 13307]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11181
diff changeset
1602 }
12745
1dc3525647c2 [gaim-migrate @ 15092]
Daniel Atallah <datallah@pidgin.im>
parents: 12741
diff changeset
1603 found = TRUE;
11189
5ac07336091e [gaim-migrate @ 13307]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11181
diff changeset
1604 } else {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1605 purple_debug(PURPLE_DEBUG_MISC, "simple", "received response to unknown transaction");
11189
5ac07336091e [gaim-migrate @ 13307]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11181
diff changeset
1606 }
5ac07336091e [gaim-migrate @ 13307]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11181
diff changeset
1607 }
5ac07336091e [gaim-migrate @ 13307]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11181
diff changeset
1608 if(!found) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1609 purple_debug(PURPLE_DEBUG_MISC, "simple", "received a unknown sip message with method %s and response %d\n", msg->method, msg->response);
11189
5ac07336091e [gaim-migrate @ 13307]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11181
diff changeset
1610 }
5ac07336091e [gaim-migrate @ 13307]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11181
diff changeset
1611 }
5ac07336091e [gaim-migrate @ 13307]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11181
diff changeset
1612
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1613 static void process_input(struct simple_account_data *sip, struct sip_connection *conn)
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1614 {
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1615 char *cur;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1616 char *dummy;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1617 struct sipmsg *msg;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1618 int restlen;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1619 cur = conn->inbuf;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1620
11341
5511bbeeb3b4 [gaim-migrate @ 13555]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11327
diff changeset
1621 /* according to the RFC remove CRLF at the beginning */
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1622 while(*cur == '\r' || *cur == '\n') {
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1623 cur++;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1624 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1625 if(cur != conn->inbuf) {
14131
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
1626 memmove(conn->inbuf, cur, conn->inbufused - (cur - conn->inbuf));
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
1627 conn->inbufused = strlen(conn->inbuf);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1628 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1629
11341
5511bbeeb3b4 [gaim-migrate @ 13555]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11327
diff changeset
1630 /* Received a full Header? */
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
1631 if((cur = strstr(conn->inbuf, "\r\n\r\n")) != NULL) {
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1632 time_t currtime = time(NULL);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1633 cur += 2;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1634 cur[0] = '\0';
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1635 purple_debug_info("simple", "\n\nreceived - %s\n######\n%s\n#######\n\n", ctime(&currtime), conn->inbuf);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1636 msg = sipmsg_parse_header(conn->inbuf);
24758
26c1c4bc47c0 Add a NULL check to fix a crash. Fixes #4516.
Richard Laager <rlaager@pidgin.im>
parents: 24638
diff changeset
1637
26c1c4bc47c0 Add a NULL check to fix a crash. Fixes #4516.
Richard Laager <rlaager@pidgin.im>
parents: 24638
diff changeset
1638 if(!msg) {
26c1c4bc47c0 Add a NULL check to fix a crash. Fixes #4516.
Richard Laager <rlaager@pidgin.im>
parents: 24638
diff changeset
1639 /* Should we re-use this error message (from lower in the function)? */
26c1c4bc47c0 Add a NULL check to fix a crash. Fixes #4516.
Richard Laager <rlaager@pidgin.im>
parents: 24638
diff changeset
1640 purple_debug_misc("simple", "received a incomplete sip msg: %s\n", conn->inbuf);
26c1c4bc47c0 Add a NULL check to fix a crash. Fixes #4516.
Richard Laager <rlaager@pidgin.im>
parents: 24638
diff changeset
1641 return;
26c1c4bc47c0 Add a NULL check to fix a crash. Fixes #4516.
Richard Laager <rlaager@pidgin.im>
parents: 24638
diff changeset
1642 }
26c1c4bc47c0 Add a NULL check to fix a crash. Fixes #4516.
Richard Laager <rlaager@pidgin.im>
parents: 24638
diff changeset
1643
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1644 cur[0] = '\r';
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1645 cur += 2;
14131
2cd4ddea2f52 [gaim-migrate @ 16690]
Daniel Atallah <datallah@pidgin.im>
parents: 14043
diff changeset
1646 restlen = conn->inbufused - (cur - conn->inbuf);
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
1647 if(restlen >= msg->bodylen) {
35221
6bd2dd10e5da Simple: fix a possible NULL-pointer dereference and add some input filtering. Fixes VRT-2013-1004
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 33782
diff changeset
1648 dummy = g_new(char, msg->bodylen + 1);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1649 memcpy(dummy, cur, msg->bodylen);
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
1650 dummy[msg->bodylen] = '\0';
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1651 msg->body = dummy;
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
1652 cur += msg->bodylen;
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
1653 memmove(conn->inbuf, cur, conn->inbuflen - (cur - conn->inbuf));
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
1654 conn->inbufused = strlen(conn->inbuf);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1655 } else {
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1656 sipmsg_free(msg);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1657 return;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1658 }
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1659 purple_debug(PURPLE_DEBUG_MISC, "simple", "in process response response: %d\n", msg->response);
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
1660 process_input_message(sip, msg);
29997
9a9b586ac254 Lots of little memleak fixes
Mark Doliner <markdoliner@pidgin.im>
parents: 29996
diff changeset
1661 sipmsg_free(msg);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1662 } else {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1663 purple_debug(PURPLE_DEBUG_MISC, "simple", "received a incomplete sip msg: %s\n", conn->inbuf);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1664 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1665 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1666
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1667 static void simple_udp_process(gpointer data, gint source, PurpleInputCondition con) {
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1668 PurpleConnection *gc = data;
11189
5ac07336091e [gaim-migrate @ 13307]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11181
diff changeset
1669 struct simple_account_data *sip = gc->proto_data;
5ac07336091e [gaim-migrate @ 13307]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11181
diff changeset
1670 struct sipmsg *msg;
5ac07336091e [gaim-migrate @ 13307]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11181
diff changeset
1671 int len;
29996
bcc1ae2c2550 Two SIMPLE changes:
Mark Doliner <markdoliner@pidgin.im>
parents: 29989
diff changeset
1672 time_t currtime = time(NULL);
11189
5ac07336091e [gaim-migrate @ 13307]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11181
diff changeset
1673
5ac07336091e [gaim-migrate @ 13307]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11181
diff changeset
1674 static char buffer[65536];
12770
f9bbe68a0c88 [gaim-migrate @ 15117]
Daniel Atallah <datallah@pidgin.im>
parents: 12769
diff changeset
1675 if((len = recv(source, buffer, sizeof(buffer) - 1, 0)) > 0) {
12748
f2cbf850b529 [gaim-migrate @ 15095]
Daniel Atallah <datallah@pidgin.im>
parents: 12746
diff changeset
1676 buffer[len] = '\0';
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1677 purple_debug_info("simple", "\n\nreceived - %s\n######\n%s\n#######\n\n", ctime(&currtime), buffer);
12748
f2cbf850b529 [gaim-migrate @ 15095]
Daniel Atallah <datallah@pidgin.im>
parents: 12746
diff changeset
1678 msg = sipmsg_parse_msg(buffer);
30007
09362ce17f6f simple: sipmsg_free() can't handle NULL. Reported by Jochen
Paul Aurich <darkrain42@pidgin.im>
parents: 29998
diff changeset
1679 if (msg) {
09362ce17f6f simple: sipmsg_free() can't handle NULL. Reported by Jochen
Paul Aurich <darkrain42@pidgin.im>
parents: 29998
diff changeset
1680 process_input_message(sip, msg);
09362ce17f6f simple: sipmsg_free() can't handle NULL. Reported by Jochen
Paul Aurich <darkrain42@pidgin.im>
parents: 29998
diff changeset
1681 sipmsg_free(msg);
09362ce17f6f simple: sipmsg_free() can't handle NULL. Reported by Jochen
Paul Aurich <darkrain42@pidgin.im>
parents: 29998
diff changeset
1682 }
12748
f2cbf850b529 [gaim-migrate @ 15095]
Daniel Atallah <datallah@pidgin.im>
parents: 12746
diff changeset
1683 }
11189
5ac07336091e [gaim-migrate @ 13307]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11181
diff changeset
1684 }
5ac07336091e [gaim-migrate @ 13307]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11181
diff changeset
1685
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1686 static void simple_input_cb(gpointer data, gint source, PurpleInputCondition cond)
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1687 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1688 PurpleConnection *gc = data;
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1689 struct simple_account_data *sip = gc->proto_data;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1690 int len;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1691 struct sip_connection *conn = connection_find(sip, source);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1692 if(!conn) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1693 purple_debug_error("simple", "Connection not found!\n");
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1694 return;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1695 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1696
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
1697 if(conn->inbuflen < conn->inbufused + SIMPLE_BUF_INC) {
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1698 conn->inbuflen += SIMPLE_BUF_INC;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1699 conn->inbuf = g_realloc(conn->inbuf, conn->inbuflen);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1700 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1701
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
1702 len = read(source, conn->inbuf + conn->inbufused, SIMPLE_BUF_INC - 1);
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
1703
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
1704 if(len < 0 && errno == EAGAIN)
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
1705 return;
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
1706 else if(len <= 0) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1707 purple_debug_info("simple", "simple_input_cb: read error\n");
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1708 connection_remove(sip, source);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1709 if(sip->fd == source) sip->fd = -1;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1710 return;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1711 }
22277
7c386db62c81 Don't send keep-alives if we've received data since in the last KEEPALIVE_INTERVAL seconds
Sean Egan <seanegan@pidgin.im>
parents: 22182
diff changeset
1712 gc->last_received = time(NULL);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1713 conn->inbufused += len;
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
1714 conn->inbuf[conn->inbufused] = '\0';
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
1715
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1716 process_input(sip, conn);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1717 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1718
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1719 /* Callback for new connections on incoming TCP port */
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1720 static void simple_newconn_cb(gpointer data, gint source, PurpleInputCondition cond) {
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1721 PurpleConnection *gc = data;
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1722 struct simple_account_data *sip = gc->proto_data;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1723 struct sip_connection *conn;
36028
fc5300cb3617 Get rid of fair amount of copy-pasta and coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
1724 int newfd;
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1725
24040
24ff94bfd09d Use non-blocking io for inbound TCP connections for SIMPLE.
Daniel Atallah <datallah@pidgin.im>
parents: 23495
diff changeset
1726 newfd = accept(source, NULL, NULL);
36041
7f35f441b939 Fix a coverity typo
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 36037
diff changeset
1727 g_return_if_fail(newfd >= 0);
36037
e2ef692ff10a Fix outstaning Coverity bugs
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 36028
diff changeset
1728
36028
fc5300cb3617 Get rid of fair amount of copy-pasta and coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
1729 _purple_network_set_common_socket_flags(newfd);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1730
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1731 conn = connection_create(sip, newfd);
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
1732
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1733 conn->inputhandler = purple_input_add(newfd, PURPLE_INPUT_READ, simple_input_cb, gc);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1734 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1735
14180
77010795da2c [gaim-migrate @ 16752]
Mark Doliner <markdoliner@pidgin.im>
parents: 14170
diff changeset
1736 static void login_cb(gpointer data, gint source, const gchar *error_message) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1737 PurpleConnection *gc = data;
14180
77010795da2c [gaim-migrate @ 16752]
Mark Doliner <markdoliner@pidgin.im>
parents: 14170
diff changeset
1738 struct simple_account_data *sip;
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1739 struct sip_connection *conn;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1740
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
1741 if(source < 0) {
27635
0cd19038c417 More uniformity among disconnect error messages
Mark Doliner <markdoliner@pidgin.im>
parents: 27350
diff changeset
1742 gchar *tmp = g_strdup_printf(_("Unable to connect: %s"),
0cd19038c417 More uniformity among disconnect error messages
Mark Doliner <markdoliner@pidgin.im>
parents: 27350
diff changeset
1743 error_message);
21279
40685e1f50ca Rename:
Will Thompson <resiak@pidgin.im>
parents: 21152
diff changeset
1744 purple_connection_error_reason(gc,
27635
0cd19038c417 More uniformity among disconnect error messages
Mark Doliner <markdoliner@pidgin.im>
parents: 27350
diff changeset
1745 PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
0cd19038c417 More uniformity among disconnect error messages
Mark Doliner <markdoliner@pidgin.im>
parents: 27350
diff changeset
1746 g_free(tmp);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1747 return;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1748 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1749
14180
77010795da2c [gaim-migrate @ 16752]
Mark Doliner <markdoliner@pidgin.im>
parents: 14170
diff changeset
1750 sip = gc->proto_data;
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1751 sip->fd = source;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1752
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
1753 conn = connection_create(sip, source);
13093
e27434c31f00 [gaim-migrate @ 15454]
Daniel Atallah <datallah@pidgin.im>
parents: 13089
diff changeset
1754
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1755 sip->registertimeout = purple_timeout_add((rand()%100)+10*1000, (GSourceFunc)subscribe_timeout, sip);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1756
11194
47dc0e9a757a [gaim-migrate @ 13317]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11192
diff changeset
1757 do_register(sip);
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
1758
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1759 conn->inputhandler = purple_input_add(sip->fd, PURPLE_INPUT_READ, simple_input_cb, gc);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1760 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1761
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1762 static guint simple_ht_hash_nick(const char *nick) {
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1763 char *lc = g_utf8_strdown(nick, -1);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1764 guint bucket = g_str_hash(lc);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1765 g_free(lc);
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
1766
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1767 return bucket;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1768 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1769
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1770 static gboolean simple_ht_equals_nick(const char *nick1, const char *nick2) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1771 return (purple_utf8_strcasecmp(nick1, nick2) == 0);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1772 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1773
12909
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12770
diff changeset
1774 static void simple_udp_host_resolved_listen_cb(int listenfd, gpointer data) {
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12770
diff changeset
1775 struct simple_account_data *sip = (struct simple_account_data*) data;
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12770
diff changeset
1776
14329
05c3cc0c1f79 [gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents: 14324
diff changeset
1777 sip->listen_data = NULL;
05c3cc0c1f79 [gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents: 14324
diff changeset
1778
12909
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12770
diff changeset
1779 if(listenfd == -1) {
21279
40685e1f50ca Rename:
Will Thompson <resiak@pidgin.im>
parents: 21152
diff changeset
1780 purple_connection_error_reason(sip->gc,
40685e1f50ca Rename:
Will Thompson <resiak@pidgin.im>
parents: 21152
diff changeset
1781 PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
27635
0cd19038c417 More uniformity among disconnect error messages
Mark Doliner <markdoliner@pidgin.im>
parents: 27350
diff changeset
1782 _("Unable to create listen socket"));
12909
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12770
diff changeset
1783 return;
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12770
diff changeset
1784 }
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12770
diff changeset
1785
29996
bcc1ae2c2550 Two SIMPLE changes:
Mark Doliner <markdoliner@pidgin.im>
parents: 29989
diff changeset
1786 /*
bcc1ae2c2550 Two SIMPLE changes:
Mark Doliner <markdoliner@pidgin.im>
parents: 29989
diff changeset
1787 * TODO: Is it correct to set sip->fd to the listenfd? For the TCP
bcc1ae2c2550 Two SIMPLE changes:
Mark Doliner <markdoliner@pidgin.im>
parents: 29989
diff changeset
1788 * listener we set sip->listenfd, but maybe UDP is different?
bcc1ae2c2550 Two SIMPLE changes:
Mark Doliner <markdoliner@pidgin.im>
parents: 29989
diff changeset
1789 * Maybe we use the same fd for outgoing data or something?
bcc1ae2c2550 Two SIMPLE changes:
Mark Doliner <markdoliner@pidgin.im>
parents: 29989
diff changeset
1790 */
12909
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12770
diff changeset
1791 sip->fd = listenfd;
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12770
diff changeset
1792
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1793 sip->listenport = purple_network_get_port_from_fd(sip->fd);
12909
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12770
diff changeset
1794
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1795 sip->listenpa = purple_input_add(sip->fd, PURPLE_INPUT_READ, simple_udp_process, sip->gc);
12909
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12770
diff changeset
1796
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1797 sip->resendtimeout = purple_timeout_add(2500, (GSourceFunc) resend_timeout, sip);
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1798 sip->registertimeout = purple_timeout_add((rand()%100)+10*1000, (GSourceFunc)subscribe_timeout, sip);
12909
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12770
diff changeset
1799 do_register(sip);
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12770
diff changeset
1800 }
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12770
diff changeset
1801
12767
4870d7755883 [gaim-migrate @ 15114]
Daniel Atallah <datallah@pidgin.im>
parents: 12760
diff changeset
1802 static void simple_udp_host_resolved(GSList *hosts, gpointer data, const char *error_message) {
4870d7755883 [gaim-migrate @ 15114]
Daniel Atallah <datallah@pidgin.im>
parents: 12760
diff changeset
1803 struct simple_account_data *sip = (struct simple_account_data*) data;
4870d7755883 [gaim-migrate @ 15114]
Daniel Atallah <datallah@pidgin.im>
parents: 12760
diff changeset
1804 int addr_size;
4870d7755883 [gaim-migrate @ 15114]
Daniel Atallah <datallah@pidgin.im>
parents: 12760
diff changeset
1805
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
1806 sip->query_data = NULL;
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
1807
12767
4870d7755883 [gaim-migrate @ 15114]
Daniel Atallah <datallah@pidgin.im>
parents: 12760
diff changeset
1808 if (!hosts || !hosts->data) {
20459
db73082a228c Add disconnection reasons to SIMPLE.
Will Thompson <resiak@pidgin.im>
parents: 19991
diff changeset
1809 purple_connection_error_reason(sip->gc,
21279
40685e1f50ca Rename:
Will Thompson <resiak@pidgin.im>
parents: 21152
diff changeset
1810 PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
27635
0cd19038c417 More uniformity among disconnect error messages
Mark Doliner <markdoliner@pidgin.im>
parents: 27350
diff changeset
1811 _("Unable to resolve hostname"));
12767
4870d7755883 [gaim-migrate @ 15114]
Daniel Atallah <datallah@pidgin.im>
parents: 12760
diff changeset
1812 return;
4870d7755883 [gaim-migrate @ 15114]
Daniel Atallah <datallah@pidgin.im>
parents: 12760
diff changeset
1813 }
4870d7755883 [gaim-migrate @ 15114]
Daniel Atallah <datallah@pidgin.im>
parents: 12760
diff changeset
1814
4870d7755883 [gaim-migrate @ 15114]
Daniel Atallah <datallah@pidgin.im>
parents: 12760
diff changeset
1815 addr_size = GPOINTER_TO_INT(hosts->data);
4870d7755883 [gaim-migrate @ 15114]
Daniel Atallah <datallah@pidgin.im>
parents: 12760
diff changeset
1816 hosts = g_slist_remove(hosts, hosts->data);
4870d7755883 [gaim-migrate @ 15114]
Daniel Atallah <datallah@pidgin.im>
parents: 12760
diff changeset
1817 memcpy(&(sip->serveraddr), hosts->data, addr_size);
4870d7755883 [gaim-migrate @ 15114]
Daniel Atallah <datallah@pidgin.im>
parents: 12760
diff changeset
1818 g_free(hosts->data);
4870d7755883 [gaim-migrate @ 15114]
Daniel Atallah <datallah@pidgin.im>
parents: 12760
diff changeset
1819 hosts = g_slist_remove(hosts, hosts->data);
4870d7755883 [gaim-migrate @ 15114]
Daniel Atallah <datallah@pidgin.im>
parents: 12760
diff changeset
1820 while(hosts) {
4870d7755883 [gaim-migrate @ 15114]
Daniel Atallah <datallah@pidgin.im>
parents: 12760
diff changeset
1821 hosts = g_slist_remove(hosts, hosts->data);
4870d7755883 [gaim-migrate @ 15114]
Daniel Atallah <datallah@pidgin.im>
parents: 12760
diff changeset
1822 g_free(hosts->data);
4870d7755883 [gaim-migrate @ 15114]
Daniel Atallah <datallah@pidgin.im>
parents: 12760
diff changeset
1823 hosts = g_slist_remove(hosts, hosts->data);
4870d7755883 [gaim-migrate @ 15114]
Daniel Atallah <datallah@pidgin.im>
parents: 12760
diff changeset
1824 }
4870d7755883 [gaim-migrate @ 15114]
Daniel Atallah <datallah@pidgin.im>
parents: 12760
diff changeset
1825
4870d7755883 [gaim-migrate @ 15114]
Daniel Atallah <datallah@pidgin.im>
parents: 12760
diff changeset
1826 /* create socket for incoming connections */
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1827 sip->listen_data = purple_network_listen_range(5060, 5160, SOCK_DGRAM,
14329
05c3cc0c1f79 [gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents: 14324
diff changeset
1828 simple_udp_host_resolved_listen_cb, sip);
05c3cc0c1f79 [gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents: 14324
diff changeset
1829 if (sip->listen_data == NULL) {
20459
db73082a228c Add disconnection reasons to SIMPLE.
Will Thompson <resiak@pidgin.im>
parents: 19991
diff changeset
1830 purple_connection_error_reason(sip->gc,
21279
40685e1f50ca Rename:
Will Thompson <resiak@pidgin.im>
parents: 21152
diff changeset
1831 PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
27635
0cd19038c417 More uniformity among disconnect error messages
Mark Doliner <markdoliner@pidgin.im>
parents: 27350
diff changeset
1832 _("Unable to create listen socket"));
12909
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12770
diff changeset
1833 return;
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12770
diff changeset
1834 }
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12770
diff changeset
1835 }
12767
4870d7755883 [gaim-migrate @ 15114]
Daniel Atallah <datallah@pidgin.im>
parents: 12760
diff changeset
1836
12909
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12770
diff changeset
1837 static void
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12770
diff changeset
1838 simple_tcp_connect_listen_cb(int listenfd, gpointer data) {
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12770
diff changeset
1839 struct simple_account_data *sip = (struct simple_account_data*) data;
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12770
diff changeset
1840
14329
05c3cc0c1f79 [gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents: 14324
diff changeset
1841 sip->listen_data = NULL;
05c3cc0c1f79 [gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents: 14324
diff changeset
1842
12909
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12770
diff changeset
1843 sip->listenfd = listenfd;
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12770
diff changeset
1844 if(sip->listenfd == -1) {
20459
db73082a228c Add disconnection reasons to SIMPLE.
Will Thompson <resiak@pidgin.im>
parents: 19991
diff changeset
1845 purple_connection_error_reason(sip->gc,
21279
40685e1f50ca Rename:
Will Thompson <resiak@pidgin.im>
parents: 21152
diff changeset
1846 PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
27635
0cd19038c417 More uniformity among disconnect error messages
Mark Doliner <markdoliner@pidgin.im>
parents: 27350
diff changeset
1847 _("Unable to create listen socket"));
12767
4870d7755883 [gaim-migrate @ 15114]
Daniel Atallah <datallah@pidgin.im>
parents: 12760
diff changeset
1848 return;
4870d7755883 [gaim-migrate @ 15114]
Daniel Atallah <datallah@pidgin.im>
parents: 12760
diff changeset
1849 }
4870d7755883 [gaim-migrate @ 15114]
Daniel Atallah <datallah@pidgin.im>
parents: 12760
diff changeset
1850
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1851 purple_debug_info("simple", "listenfd: %d\n", sip->listenfd);
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1852 sip->listenport = purple_network_get_port_from_fd(sip->listenfd);
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1853 sip->listenpa = purple_input_add(sip->listenfd, PURPLE_INPUT_READ,
12909
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12770
diff changeset
1854 simple_newconn_cb, sip->gc);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1855 purple_debug_info("simple", "connecting to %s port %d\n",
12909
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12770
diff changeset
1856 sip->realhostname, sip->realport);
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12770
diff changeset
1857 /* open tcp connection to the server */
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1858 if (purple_proxy_connect(sip->gc, sip->account, sip->realhostname,
14899
c65f0b4fb351 [gaim-migrate @ 17606]
Mark Doliner <markdoliner@pidgin.im>
parents: 14696
diff changeset
1859 sip->realport, login_cb, sip->gc) == NULL) {
20459
db73082a228c Add disconnection reasons to SIMPLE.
Will Thompson <resiak@pidgin.im>
parents: 19991
diff changeset
1860 purple_connection_error_reason(sip->gc,
21279
40685e1f50ca Rename:
Will Thompson <resiak@pidgin.im>
parents: 21152
diff changeset
1861 PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
27635
0cd19038c417 More uniformity among disconnect error messages
Mark Doliner <markdoliner@pidgin.im>
parents: 27350
diff changeset
1862 _("Unable to connect"));
12909
dfcf4df1dcd7 [gaim-migrate @ 15262]
Daniel Atallah <datallah@pidgin.im>
parents: 12770
diff changeset
1863 }
12767
4870d7755883 [gaim-migrate @ 15114]
Daniel Atallah <datallah@pidgin.im>
parents: 12760
diff changeset
1864 }
4870d7755883 [gaim-migrate @ 15114]
Daniel Atallah <datallah@pidgin.im>
parents: 12760
diff changeset
1865
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1866 static void srvresolved(PurpleSrvResponse *resp, int results, gpointer data) {
13581
d0f0e28aa864 [gaim-migrate @ 15962]
Mark Doliner <markdoliner@pidgin.im>
parents: 13399
diff changeset
1867 struct simple_account_data *sip;
d0f0e28aa864 [gaim-migrate @ 15962]
Mark Doliner <markdoliner@pidgin.im>
parents: 13399
diff changeset
1868 gchar *hostname;
d0f0e28aa864 [gaim-migrate @ 15962]
Mark Doliner <markdoliner@pidgin.im>
parents: 13399
diff changeset
1869 int port;
11383
2c5a70e62389 [gaim-migrate @ 13610]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11346
diff changeset
1870
14370
12ef3d4096ee [gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents: 14329
diff changeset
1871 sip = data;
12ef3d4096ee [gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents: 14329
diff changeset
1872 sip->srv_query_data = NULL;
13581
d0f0e28aa864 [gaim-migrate @ 15962]
Mark Doliner <markdoliner@pidgin.im>
parents: 13399
diff changeset
1873
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1874 port = purple_account_get_int(sip->account, "port", 0);
11383
2c5a70e62389 [gaim-migrate @ 13610]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11346
diff changeset
1875
2c5a70e62389 [gaim-migrate @ 13610]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11346
diff changeset
1876 /* find the host to connect to */
2c5a70e62389 [gaim-migrate @ 13610]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11346
diff changeset
1877 if(results) {
2c5a70e62389 [gaim-migrate @ 13610]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11346
diff changeset
1878 hostname = g_strdup(resp->hostname);
12769
21ce86fd6ffa [gaim-migrate @ 15116]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 12768
diff changeset
1879 if(!port)
21ce86fd6ffa [gaim-migrate @ 15116]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 12768
diff changeset
1880 port = resp->port;
11383
2c5a70e62389 [gaim-migrate @ 13610]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11346
diff changeset
1881 g_free(resp);
2c5a70e62389 [gaim-migrate @ 13610]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11346
diff changeset
1882 } else {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1883 if(!purple_account_get_bool(sip->account, "useproxy", FALSE)) {
11383
2c5a70e62389 [gaim-migrate @ 13610]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11346
diff changeset
1884 hostname = g_strdup(sip->servername);
2c5a70e62389 [gaim-migrate @ 13610]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11346
diff changeset
1885 } else {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1886 hostname = g_strdup(purple_account_get_string(sip->account, "proxy", sip->servername));
11383
2c5a70e62389 [gaim-migrate @ 13610]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11346
diff changeset
1887 }
2c5a70e62389 [gaim-migrate @ 13610]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11346
diff changeset
1888 }
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
1889
11383
2c5a70e62389 [gaim-migrate @ 13610]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11346
diff changeset
1890 sip->realhostname = hostname;
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
1891 sip->realport = port;
12769
21ce86fd6ffa [gaim-migrate @ 15116]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 12768
diff changeset
1892 if(!sip->realport) sip->realport = 5060;
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
1893
11383
2c5a70e62389 [gaim-migrate @ 13610]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11346
diff changeset
1894 /* TCP case */
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
1895 if(!sip->udp) {
11409
2a3466f4a32c [gaim-migrate @ 13646]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11396
diff changeset
1896 /* create socket for incoming connections */
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1897 sip->listen_data = purple_network_listen_range(5060, 5160, SOCK_STREAM,
14329
05c3cc0c1f79 [gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents: 14324
diff changeset
1898 simple_tcp_connect_listen_cb, sip);
05c3cc0c1f79 [gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents: 14324
diff changeset
1899 if (sip->listen_data == NULL) {
21279
40685e1f50ca Rename:
Will Thompson <resiak@pidgin.im>
parents: 21152
diff changeset
1900 purple_connection_error_reason(sip->gc,
40685e1f50ca Rename:
Will Thompson <resiak@pidgin.im>
parents: 21152
diff changeset
1901 PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
27635
0cd19038c417 More uniformity among disconnect error messages
Mark Doliner <markdoliner@pidgin.im>
parents: 27350
diff changeset
1902 _("Unable to create listen socket"));
11409
2a3466f4a32c [gaim-migrate @ 13646]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11396
diff changeset
1903 return;
2a3466f4a32c [gaim-migrate @ 13646]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11396
diff changeset
1904 }
11383
2c5a70e62389 [gaim-migrate @ 13610]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11346
diff changeset
1905 } else { /* UDP */
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1906 purple_debug_info("simple", "using udp with server %s and port %d\n", hostname, port);
12565
8601c9c26f93 [gaim-migrate @ 14884]
Daniel Atallah <datallah@pidgin.im>
parents: 12563
diff changeset
1907
31680
d3902c687705 Use the new account-contextual DNS API everywhere. Refs #11110
Daniel Atallah <datallah@pidgin.im>
parents: 31595
diff changeset
1908 sip->query_data = purple_dnsquery_a_account(sip->account, hostname,
d3902c687705 Use the new account-contextual DNS API everywhere. Refs #11110
Daniel Atallah <datallah@pidgin.im>
parents: 31595
diff changeset
1909 port, simple_udp_host_resolved, sip);
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
1910 if (sip->query_data == NULL) {
21279
40685e1f50ca Rename:
Will Thompson <resiak@pidgin.im>
parents: 21152
diff changeset
1911 purple_connection_error_reason(sip->gc,
40685e1f50ca Rename:
Will Thompson <resiak@pidgin.im>
parents: 21152
diff changeset
1912 PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
27635
0cd19038c417 More uniformity among disconnect error messages
Mark Doliner <markdoliner@pidgin.im>
parents: 27350
diff changeset
1913 _("Unable to resolve hostname"));
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
1914 }
11383
2c5a70e62389 [gaim-migrate @ 13610]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11346
diff changeset
1915 }
2c5a70e62389 [gaim-migrate @ 13610]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11346
diff changeset
1916 }
2c5a70e62389 [gaim-migrate @ 13610]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11346
diff changeset
1917
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1918 static void simple_login(PurpleAccount *account)
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1919 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1920 PurpleConnection *gc;
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1921 struct simple_account_data *sip;
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1922 gchar **userserver;
23495
cc9ee7e6a09f There's no need to dup this
Mark Doliner <markdoliner@pidgin.im>
parents: 23302
diff changeset
1923 const gchar *hosttoconnect;
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
1924
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1925 const char *username = purple_account_get_username(account);
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1926 gc = purple_account_get_connection(account);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1927
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
1928 if (strpbrk(username, " \t\v\r\n") != NULL) {
21279
40685e1f50ca Rename:
Will Thompson <resiak@pidgin.im>
parents: 21152
diff changeset
1929 purple_connection_error_reason(gc,
40685e1f50ca Rename:
Will Thompson <resiak@pidgin.im>
parents: 21152
diff changeset
1930 PURPLE_CONNECTION_ERROR_INVALID_SETTINGS,
22942
2bf494f8e2a4 Change the string "screen name" to "username" everywhere. I think most
Mark Doliner <markdoliner@pidgin.im>
parents: 22709
diff changeset
1931 _("SIP usernames may not contain whitespaces or @ symbols"));
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
1932 return;
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
1933 }
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1934
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
1935 gc->proto_data = sip = g_new0(struct simple_account_data, 1);
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
1936 sip->gc = gc;
31949
f141aee90086 Fix some closes on invalid fds, which can crash on Windows.
Florian Quèze <florian@instantbird.org>
parents: 31680
diff changeset
1937 sip->fd = -1;
f141aee90086 Fix some closes on invalid fds, which can crash on Windows.
Florian Quèze <florian@instantbird.org>
parents: 31680
diff changeset
1938 sip->listenfd = -1;
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
1939 sip->account = account;
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
1940 sip->registerexpire = 900;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1941 sip->udp = purple_account_get_bool(account, "udp", FALSE);
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
1942 /* TODO: is there a good default grow size? */
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
1943 if(!sip->udp)
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1944 sip->txbuf = purple_circ_buffer_new(0);
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13185
diff changeset
1945
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1946 userserver = g_strsplit(username, "@", 2);
25179
0dbf2eb5f168 Don't allow connecting a SIMPLE account if no server is configured. Fixes #7767.
Florian Quèze <florian@instantbird.org>
parents: 24845
diff changeset
1947 if (userserver[1] == NULL || userserver[1][0] == '\0') {
0dbf2eb5f168 Don't allow connecting a SIMPLE account if no server is configured. Fixes #7767.
Florian Quèze <florian@instantbird.org>
parents: 24845
diff changeset
1948 purple_connection_error_reason(gc,
0dbf2eb5f168 Don't allow connecting a SIMPLE account if no server is configured. Fixes #7767.
Florian Quèze <florian@instantbird.org>
parents: 24845
diff changeset
1949 PURPLE_CONNECTION_ERROR_INVALID_SETTINGS,
25206
4758bccd444c disapproval of revision '99fcf96872a999874e2f1e5f46bd44f4a487119c'
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 25201
diff changeset
1950 _("SIP connect server not specified"));
25179
0dbf2eb5f168 Don't allow connecting a SIMPLE account if no server is configured. Fixes #7767.
Florian Quèze <florian@instantbird.org>
parents: 24845
diff changeset
1951 return;
0dbf2eb5f168 Don't allow connecting a SIMPLE account if no server is configured. Fixes #7767.
Florian Quèze <florian@instantbird.org>
parents: 24845
diff changeset
1952 }
0dbf2eb5f168 Don't allow connecting a SIMPLE account if no server is configured. Fixes #7767.
Florian Quèze <florian@instantbird.org>
parents: 24845
diff changeset
1953
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1954 purple_connection_set_display_name(gc, userserver[0]);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1955 sip->username = g_strdup(userserver[0]);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1956 sip->servername = g_strdup(userserver[1]);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1957 sip->password = g_strdup(purple_connection_get_password(gc));
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1958 g_strfreev(userserver);
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1959
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1960 sip->buddies = g_hash_table_new((GHashFunc)simple_ht_hash_nick, (GEqualFunc)simple_ht_equals_nick);
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
1961
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1962 purple_connection_update_progress(gc, _("Connecting"), 1, 2);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1963
11837
2f1206084fef [gaim-migrate @ 14128]
Mark Doliner <markdoliner@pidgin.im>
parents: 11718
diff changeset
1964 /* TODO: Set the status correctly. */
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1965 sip->status = g_strdup("available");
11189
5ac07336091e [gaim-migrate @ 13307]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11181
diff changeset
1966
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1967 if(!purple_account_get_bool(account, "useproxy", FALSE)) {
23495
cc9ee7e6a09f There's no need to dup this
Mark Doliner <markdoliner@pidgin.im>
parents: 23302
diff changeset
1968 hosttoconnect = sip->servername;
11210
95ba2527d7d1 [gaim-migrate @ 13341]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11194
diff changeset
1969 } else {
23495
cc9ee7e6a09f There's no need to dup this
Mark Doliner <markdoliner@pidgin.im>
parents: 23302
diff changeset
1970 hosttoconnect = purple_account_get_string(account, "proxy", sip->servername);
11210
95ba2527d7d1 [gaim-migrate @ 13341]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11194
diff changeset
1971 }
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
1972
31680
d3902c687705 Use the new account-contextual DNS API everywhere. Refs #11110
Daniel Atallah <datallah@pidgin.im>
parents: 31595
diff changeset
1973 sip->srv_query_data = purple_srv_resolve_account(account, "sip",
14370
12ef3d4096ee [gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents: 14329
diff changeset
1974 sip->udp ? "udp" : "tcp", hosttoconnect, srvresolved, sip);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1975 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1976
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1977 static void simple_close(PurpleConnection *gc)
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1978 {
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
1979 struct simple_account_data *sip = gc->proto_data;
11194
47dc0e9a757a [gaim-migrate @ 13317]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11192
diff changeset
1980
29989
18bc65ced65a Exit early if sip is null, instead of putting the whole body of this
Mark Doliner <markdoliner@pidgin.im>
parents: 29757
diff changeset
1981 if (!sip)
18bc65ced65a Exit early if sip is null, instead of putting the whole body of this
Mark Doliner <markdoliner@pidgin.im>
parents: 29757
diff changeset
1982 return;
18bc65ced65a Exit early if sip is null, instead of putting the whole body of this
Mark Doliner <markdoliner@pidgin.im>
parents: 29757
diff changeset
1983
18bc65ced65a Exit early if sip is null, instead of putting the whole body of this
Mark Doliner <markdoliner@pidgin.im>
parents: 29757
diff changeset
1984 /* unregister */
18bc65ced65a Exit early if sip is null, instead of putting the whole body of this
Mark Doliner <markdoliner@pidgin.im>
parents: 29757
diff changeset
1985 if (sip->registerstatus == SIMPLE_REGISTER_COMPLETE)
18bc65ced65a Exit early if sip is null, instead of putting the whole body of this
Mark Doliner <markdoliner@pidgin.im>
parents: 29757
diff changeset
1986 {
18bc65ced65a Exit early if sip is null, instead of putting the whole body of this
Mark Doliner <markdoliner@pidgin.im>
parents: 29757
diff changeset
1987 g_hash_table_foreach(sip->buddies,
18bc65ced65a Exit early if sip is null, instead of putting the whole body of this
Mark Doliner <markdoliner@pidgin.im>
parents: 29757
diff changeset
1988 (GHFunc)simple_unsubscribe,
18bc65ced65a Exit early if sip is null, instead of putting the whole body of this
Mark Doliner <markdoliner@pidgin.im>
parents: 29757
diff changeset
1989 (gpointer)sip);
18bc65ced65a Exit early if sip is null, instead of putting the whole body of this
Mark Doliner <markdoliner@pidgin.im>
parents: 29757
diff changeset
1990
18bc65ced65a Exit early if sip is null, instead of putting the whole body of this
Mark Doliner <markdoliner@pidgin.im>
parents: 29757
diff changeset
1991 if (purple_account_get_bool(sip->account, "dopublish", TRUE))
18bc65ced65a Exit early if sip is null, instead of putting the whole body of this
Mark Doliner <markdoliner@pidgin.im>
parents: 29757
diff changeset
1992 send_closed_publish(sip);
21417
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1993
29989
18bc65ced65a Exit early if sip is null, instead of putting the whole body of this
Mark Doliner <markdoliner@pidgin.im>
parents: 29757
diff changeset
1994 do_register_exp(sip, 0);
18bc65ced65a Exit early if sip is null, instead of putting the whole body of this
Mark Doliner <markdoliner@pidgin.im>
parents: 29757
diff changeset
1995 }
18bc65ced65a Exit early if sip is null, instead of putting the whole body of this
Mark Doliner <markdoliner@pidgin.im>
parents: 29757
diff changeset
1996 connection_free_all(sip);
21417
48f4f6c2fe47 Patch from Will Hawkins to make the SIMPLE prpl more standards compliant by keeping all subscribe/notify messaging within a dialog. This didn't apply cleanly, so I had to manually apply it - hopefully I didn't break anything during the process. Fixes #3778.
Daniel Atallah <datallah@pidgin.im>
parents: 21106
diff changeset
1997
29996
bcc1ae2c2550 Two SIMPLE changes:
Mark Doliner <markdoliner@pidgin.im>
parents: 29989
diff changeset
1998 if (sip->listenpa)
bcc1ae2c2550 Two SIMPLE changes:
Mark Doliner <markdoliner@pidgin.im>
parents: 29989
diff changeset
1999 purple_input_remove(sip->listenpa);
bcc1ae2c2550 Two SIMPLE changes:
Mark Doliner <markdoliner@pidgin.im>
parents: 29989
diff changeset
2000 if (sip->tx_handler)
bcc1ae2c2550 Two SIMPLE changes:
Mark Doliner <markdoliner@pidgin.im>
parents: 29989
diff changeset
2001 purple_input_remove(sip->tx_handler);
bcc1ae2c2550 Two SIMPLE changes:
Mark Doliner <markdoliner@pidgin.im>
parents: 29989
diff changeset
2002 if (sip->resendtimeout)
bcc1ae2c2550 Two SIMPLE changes:
Mark Doliner <markdoliner@pidgin.im>
parents: 29989
diff changeset
2003 purple_timeout_remove(sip->resendtimeout);
bcc1ae2c2550 Two SIMPLE changes:
Mark Doliner <markdoliner@pidgin.im>
parents: 29989
diff changeset
2004 if (sip->registertimeout)
bcc1ae2c2550 Two SIMPLE changes:
Mark Doliner <markdoliner@pidgin.im>
parents: 29989
diff changeset
2005 purple_timeout_remove(sip->registertimeout);
29989
18bc65ced65a Exit early if sip is null, instead of putting the whole body of this
Mark Doliner <markdoliner@pidgin.im>
parents: 29757
diff changeset
2006 if (sip->query_data != NULL)
18bc65ced65a Exit early if sip is null, instead of putting the whole body of this
Mark Doliner <markdoliner@pidgin.im>
parents: 29757
diff changeset
2007 purple_dnsquery_destroy(sip->query_data);
13399
e877a5672fe8 [gaim-migrate @ 15772]
Richard Laager <rlaager@pidgin.im>
parents: 13348
diff changeset
2008
29989
18bc65ced65a Exit early if sip is null, instead of putting the whole body of this
Mark Doliner <markdoliner@pidgin.im>
parents: 29757
diff changeset
2009 if (sip->srv_query_data != NULL)
18bc65ced65a Exit early if sip is null, instead of putting the whole body of this
Mark Doliner <markdoliner@pidgin.im>
parents: 29757
diff changeset
2010 purple_srv_cancel(sip->srv_query_data);
14300
68a0aa63f3b8 [gaim-migrate @ 16920]
Mark Doliner <markdoliner@pidgin.im>
parents: 14254
diff changeset
2011
29989
18bc65ced65a Exit early if sip is null, instead of putting the whole body of this
Mark Doliner <markdoliner@pidgin.im>
parents: 29757
diff changeset
2012 if (sip->listen_data != NULL)
18bc65ced65a Exit early if sip is null, instead of putting the whole body of this
Mark Doliner <markdoliner@pidgin.im>
parents: 29757
diff changeset
2013 purple_network_listen_cancel(sip->listen_data);
14370
12ef3d4096ee [gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents: 14329
diff changeset
2014
29996
bcc1ae2c2550 Two SIMPLE changes:
Mark Doliner <markdoliner@pidgin.im>
parents: 29989
diff changeset
2015 if (sip->fd >= 0)
bcc1ae2c2550 Two SIMPLE changes:
Mark Doliner <markdoliner@pidgin.im>
parents: 29989
diff changeset
2016 close(sip->fd);
bcc1ae2c2550 Two SIMPLE changes:
Mark Doliner <markdoliner@pidgin.im>
parents: 29989
diff changeset
2017 if (sip->listenfd >= 0)
bcc1ae2c2550 Two SIMPLE changes:
Mark Doliner <markdoliner@pidgin.im>
parents: 29989
diff changeset
2018 close(sip->listenfd);
bcc1ae2c2550 Two SIMPLE changes:
Mark Doliner <markdoliner@pidgin.im>
parents: 29989
diff changeset
2019
29989
18bc65ced65a Exit early if sip is null, instead of putting the whole body of this
Mark Doliner <markdoliner@pidgin.im>
parents: 29757
diff changeset
2020 g_free(sip->servername);
18bc65ced65a Exit early if sip is null, instead of putting the whole body of this
Mark Doliner <markdoliner@pidgin.im>
parents: 29757
diff changeset
2021 g_free(sip->username);
18bc65ced65a Exit early if sip is null, instead of putting the whole body of this
Mark Doliner <markdoliner@pidgin.im>
parents: 29757
diff changeset
2022 g_free(sip->password);
18bc65ced65a Exit early if sip is null, instead of putting the whole body of this
Mark Doliner <markdoliner@pidgin.im>
parents: 29757
diff changeset
2023 g_free(sip->registrar.nonce);
18bc65ced65a Exit early if sip is null, instead of putting the whole body of this
Mark Doliner <markdoliner@pidgin.im>
parents: 29757
diff changeset
2024 g_free(sip->registrar.opaque);
18bc65ced65a Exit early if sip is null, instead of putting the whole body of this
Mark Doliner <markdoliner@pidgin.im>
parents: 29757
diff changeset
2025 g_free(sip->registrar.target);
18bc65ced65a Exit early if sip is null, instead of putting the whole body of this
Mark Doliner <markdoliner@pidgin.im>
parents: 29757
diff changeset
2026 g_free(sip->registrar.realm);
18bc65ced65a Exit early if sip is null, instead of putting the whole body of this
Mark Doliner <markdoliner@pidgin.im>
parents: 29757
diff changeset
2027 g_free(sip->registrar.digest_session_key);
18bc65ced65a Exit early if sip is null, instead of putting the whole body of this
Mark Doliner <markdoliner@pidgin.im>
parents: 29757
diff changeset
2028 g_free(sip->proxy.nonce);
18bc65ced65a Exit early if sip is null, instead of putting the whole body of this
Mark Doliner <markdoliner@pidgin.im>
parents: 29757
diff changeset
2029 g_free(sip->proxy.opaque);
18bc65ced65a Exit early if sip is null, instead of putting the whole body of this
Mark Doliner <markdoliner@pidgin.im>
parents: 29757
diff changeset
2030 g_free(sip->proxy.target);
18bc65ced65a Exit early if sip is null, instead of putting the whole body of this
Mark Doliner <markdoliner@pidgin.im>
parents: 29757
diff changeset
2031 g_free(sip->proxy.realm);
18bc65ced65a Exit early if sip is null, instead of putting the whole body of this
Mark Doliner <markdoliner@pidgin.im>
parents: 29757
diff changeset
2032 g_free(sip->proxy.digest_session_key);
29997
9a9b586ac254 Lots of little memleak fixes
Mark Doliner <markdoliner@pidgin.im>
parents: 29996
diff changeset
2033 g_free(sip->status);
9a9b586ac254 Lots of little memleak fixes
Mark Doliner <markdoliner@pidgin.im>
parents: 29996
diff changeset
2034 g_hash_table_destroy(sip->buddies);
9a9b586ac254 Lots of little memleak fixes
Mark Doliner <markdoliner@pidgin.im>
parents: 29996
diff changeset
2035 g_free(sip->regcallid);
29998
fcacdafd0f2d Fix one more small memleak by freeing any lingering transactions at shutdown
Mark Doliner <markdoliner@pidgin.im>
parents: 29997
diff changeset
2036 while (sip->transactions)
fcacdafd0f2d Fix one more small memleak by freeing any lingering transactions at shutdown
Mark Doliner <markdoliner@pidgin.im>
parents: 29997
diff changeset
2037 transactions_remove(sip, sip->transactions->data);
29989
18bc65ced65a Exit early if sip is null, instead of putting the whole body of this
Mark Doliner <markdoliner@pidgin.im>
parents: 29757
diff changeset
2038 g_free(sip->publish_etag);
18bc65ced65a Exit early if sip is null, instead of putting the whole body of this
Mark Doliner <markdoliner@pidgin.im>
parents: 29757
diff changeset
2039 if (sip->txbuf)
18bc65ced65a Exit early if sip is null, instead of putting the whole body of this
Mark Doliner <markdoliner@pidgin.im>
parents: 29757
diff changeset
2040 purple_circ_buffer_destroy(sip->txbuf);
18bc65ced65a Exit early if sip is null, instead of putting the whole body of this
Mark Doliner <markdoliner@pidgin.im>
parents: 29757
diff changeset
2041 g_free(sip->realhostname);
14329
05c3cc0c1f79 [gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents: 14324
diff changeset
2042
29989
18bc65ced65a Exit early if sip is null, instead of putting the whole body of this
Mark Doliner <markdoliner@pidgin.im>
parents: 29757
diff changeset
2043 g_free(sip);
12571
7c80d5a7d9f7 [gaim-migrate @ 14890]
Daniel Atallah <datallah@pidgin.im>
parents: 12570
diff changeset
2044 gc->proto_data = NULL;
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2045 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2046
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
2047 static PurplePluginProtocolInfo prpl_info =
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2048 {
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2049 0,
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2050 NULL, /* user_splits */
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2051 NULL, /* protocol_options */
12143
09f216663302 [gaim-migrate @ 14444]
Evan Schoenberg <evands@pidgin.im>
parents: 11837
diff changeset
2052 NO_BUDDY_ICONS, /* icon_spec */
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2053 simple_list_icon, /* list_icon */
12143
09f216663302 [gaim-migrate @ 14444]
Evan Schoenberg <evands@pidgin.im>
parents: 11837
diff changeset
2054 NULL, /* list_emblems */
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2055 NULL, /* status_text */
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2056 NULL, /* tooltip_text */
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2057 simple_status_types, /* away_states */
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2058 NULL, /* blist_node_menu */
12143
09f216663302 [gaim-migrate @ 14444]
Evan Schoenberg <evands@pidgin.im>
parents: 11837
diff changeset
2059 NULL, /* chat_info */
09f216663302 [gaim-migrate @ 14444]
Evan Schoenberg <evands@pidgin.im>
parents: 11837
diff changeset
2060 NULL, /* chat_info_defaults */
09f216663302 [gaim-migrate @ 14444]
Evan Schoenberg <evands@pidgin.im>
parents: 11837
diff changeset
2061 simple_login, /* login */
09f216663302 [gaim-migrate @ 14444]
Evan Schoenberg <evands@pidgin.im>
parents: 11837
diff changeset
2062 simple_close, /* close */
09f216663302 [gaim-migrate @ 14444]
Evan Schoenberg <evands@pidgin.im>
parents: 11837
diff changeset
2063 simple_im_send, /* send_im */
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2064 NULL, /* set_info */
12143
09f216663302 [gaim-migrate @ 14444]
Evan Schoenberg <evands@pidgin.im>
parents: 11837
diff changeset
2065 simple_typing, /* send_typing */
09f216663302 [gaim-migrate @ 14444]
Evan Schoenberg <evands@pidgin.im>
parents: 11837
diff changeset
2066 NULL, /* get_info */
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2067 simple_set_status, /* set_status */
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2068 NULL, /* set_idle */
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2069 NULL, /* change_passwd */
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2070 simple_add_buddy, /* add_buddy */
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2071 NULL, /* add_buddies */
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2072 simple_remove_buddy, /* remove_buddy */
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2073 NULL, /* remove_buddies */
22388
9f418ec14552 Remove some empty PRPL callbacks
Mark Doliner <markdoliner@pidgin.im>
parents: 22277
diff changeset
2074 NULL, /* add_permit */
9f418ec14552 Remove some empty PRPL callbacks
Mark Doliner <markdoliner@pidgin.im>
parents: 22277
diff changeset
2075 NULL, /* add_deny */
9f418ec14552 Remove some empty PRPL callbacks
Mark Doliner <markdoliner@pidgin.im>
parents: 22277
diff changeset
2076 NULL, /* rem_permit */
9f418ec14552 Remove some empty PRPL callbacks
Mark Doliner <markdoliner@pidgin.im>
parents: 22277
diff changeset
2077 NULL, /* rem_deny */
9f418ec14552 Remove some empty PRPL callbacks
Mark Doliner <markdoliner@pidgin.im>
parents: 22277
diff changeset
2078 NULL, /* set_permit_deny */
12143
09f216663302 [gaim-migrate @ 14444]
Evan Schoenberg <evands@pidgin.im>
parents: 11837
diff changeset
2079 NULL, /* join_chat */
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2080 NULL, /* reject_chat */
12143
09f216663302 [gaim-migrate @ 14444]
Evan Schoenberg <evands@pidgin.im>
parents: 11837
diff changeset
2081 NULL, /* get_chat_name */
09f216663302 [gaim-migrate @ 14444]
Evan Schoenberg <evands@pidgin.im>
parents: 11837
diff changeset
2082 NULL, /* chat_invite */
09f216663302 [gaim-migrate @ 14444]
Evan Schoenberg <evands@pidgin.im>
parents: 11837
diff changeset
2083 NULL, /* chat_leave */
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2084 NULL, /* chat_whisper */
12143
09f216663302 [gaim-migrate @ 14444]
Evan Schoenberg <evands@pidgin.im>
parents: 11837
diff changeset
2085 NULL, /* chat_send */
09f216663302 [gaim-migrate @ 14444]
Evan Schoenberg <evands@pidgin.im>
parents: 11837
diff changeset
2086 simple_keep_alive, /* keepalive */
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2087 NULL, /* register_user */
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2088 NULL, /* get_cb_info */
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2089 NULL, /* get_cb_away */
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2090 NULL, /* alias_buddy */
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2091 NULL, /* group_buddy */
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2092 NULL, /* rename_group */
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2093 NULL, /* buddy_free */
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2094 NULL, /* convo_closed */
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2095 NULL, /* normalize */
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2096 NULL, /* set_buddy_icon */
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2097 NULL, /* remove_group */
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2098 NULL, /* get_cb_real_name */
12143
09f216663302 [gaim-migrate @ 14444]
Evan Schoenberg <evands@pidgin.im>
parents: 11837
diff changeset
2099 NULL, /* set_chat_topic */
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2100 NULL, /* find_blist_chat */
12143
09f216663302 [gaim-migrate @ 14444]
Evan Schoenberg <evands@pidgin.im>
parents: 11837
diff changeset
2101 NULL, /* roomlist_get_list */
09f216663302 [gaim-migrate @ 14444]
Evan Schoenberg <evands@pidgin.im>
parents: 11837
diff changeset
2102 NULL, /* roomlist_cancel */
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2103 NULL, /* roomlist_expand_category */
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2104 NULL, /* can_receive_file */
12143
09f216663302 [gaim-migrate @ 14444]
Evan Schoenberg <evands@pidgin.im>
parents: 11837
diff changeset
2105 NULL, /* send_file */
12600
7ecd4441fdc7 [gaim-migrate @ 14934]
Richard Laager <rlaager@pidgin.im>
parents: 12595
diff changeset
2106 NULL, /* new_xfer */
12645
a907ba243930 [gaim-migrate @ 14983]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 12600
diff changeset
2107 NULL, /* offline_message */
12600
7ecd4441fdc7 [gaim-migrate @ 14934]
Richard Laager <rlaager@pidgin.im>
parents: 12595
diff changeset
2108 NULL, /* whiteboard_prpl_ops */
15185
74b689a74430 [gaim-migrate @ 17909]
Nathan Walp <nwalp@pidgin.im>
parents: 15062
diff changeset
2109 simple_send_raw, /* send_raw */
74b689a74430 [gaim-migrate @ 17909]
Nathan Walp <nwalp@pidgin.im>
parents: 15062
diff changeset
2110 NULL, /* roomlist_room_serialize */
22071
4c47e360e467 Fix the prplinfo structs and get rid of some compile warnings.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22069
diff changeset
2111 NULL, /* unregister_user */
4c47e360e467 Fix the prplinfo structs and get rid of some compile warnings.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22069
diff changeset
2112 NULL, /* send_attention */
4c47e360e467 Fix the prplinfo structs and get rid of some compile warnings.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22069
diff changeset
2113 NULL, /* get_attention_types */
23276
f4944cfaa1ff Use up the last padding for PurplePluginProtocolInfo in a way that allows
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22709
diff changeset
2114 sizeof(PurplePluginProtocolInfo), /* struct_size */
23707
480f94157418 propagate from branch 'im.pidgin.pidgin' (head bd5f7f61d9349053ee4738efc0d17453f0574057)
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23302 23696
diff changeset
2115 NULL, /* get_account_text_table */
22648
e286d795c5f9 Patch from Marcus Lundblad ('mlundblad') to improve audio support in xmpp.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22647
diff changeset
2116 NULL, /* initiate_media */
29757
f137c1386384 Add a NULL for PurplePluginProtocolInfo::get_moods to all the plugins I build
Paul Aurich <darkrain42@pidgin.im>
parents: 27635
diff changeset
2117 NULL, /* get_media_caps */
30138
cca9685df785 Add purple_account_[gs]et_public_alias functions, per discussion in d@cpi
Paul Aurich <darkrain42@pidgin.im>
parents: 30007
diff changeset
2118 NULL, /* get_moods */
cca9685df785 Add purple_account_[gs]et_public_alias functions, per discussion in d@cpi
Paul Aurich <darkrain42@pidgin.im>
parents: 30007
diff changeset
2119 NULL, /* set_public_alias */
31595
ffc150f21bec Update PRPL structs with new fields.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 31294
diff changeset
2120 NULL, /* get_public_alias */
ffc150f21bec Update PRPL structs with new fields.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 31294
diff changeset
2121 NULL, /* add_buddy_with_invite */
ffc150f21bec Update PRPL structs with new fields.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 31294
diff changeset
2122 NULL /* add_buddies_with_invite */
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2123 };
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2124
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2125
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
2126 static PurplePluginInfo info =
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2127 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
2128 PURPLE_PLUGIN_MAGIC,
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
2129 PURPLE_MAJOR_VERSION,
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
2130 PURPLE_MINOR_VERSION,
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
2131 PURPLE_PLUGIN_PROTOCOL, /**< type */
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2132 NULL, /**< ui_requirement */
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2133 0, /**< flags */
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2134 NULL, /**< dependencies */
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
2135 PURPLE_PRIORITY_DEFAULT, /**< priority */
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2136
12489
14274d68d499 [gaim-migrate @ 14801]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents: 12456
diff changeset
2137 "prpl-simple", /**< id */
14274d68d499 [gaim-migrate @ 14801]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents: 12456
diff changeset
2138 "SIMPLE", /**< name */
21106
b85fbef13eed Add a --with-extraversion option to ./configure so packagers can fine tune
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21100
diff changeset
2139 DISPLAY_VERSION, /**< version */
12489
14274d68d499 [gaim-migrate @ 14801]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents: 12456
diff changeset
2140 N_("SIP/SIMPLE Protocol Plugin"), /** summary */
14274d68d499 [gaim-migrate @ 14801]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents: 12456
diff changeset
2141 N_("The SIP/SIMPLE Protocol Plugin"), /** description */
14274d68d499 [gaim-migrate @ 14801]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents: 12456
diff changeset
2142 "Thomas Butter <butter@uni-mannheim.de>", /**< author */
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
2143 PURPLE_WEBSITE, /**< homepage */
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2144
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2145 NULL, /**< load */
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2146 NULL, /**< unload */
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2147 NULL, /**< destroy */
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2148
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2149 NULL, /**< ui_info */
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2150 &prpl_info, /**< extra_info */
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2151 NULL,
16746
72faf41c3c4f And now the protocols
Gary Kramlich <grim@reaperworld.com>
parents: 16238
diff changeset
2152 NULL,
72faf41c3c4f And now the protocols
Gary Kramlich <grim@reaperworld.com>
parents: 16238
diff changeset
2153
72faf41c3c4f And now the protocols
Gary Kramlich <grim@reaperworld.com>
parents: 16238
diff changeset
2154 /* padding */
72faf41c3c4f And now the protocols
Gary Kramlich <grim@reaperworld.com>
parents: 16238
diff changeset
2155 NULL,
72faf41c3c4f And now the protocols
Gary Kramlich <grim@reaperworld.com>
parents: 16238
diff changeset
2156 NULL,
72faf41c3c4f And now the protocols
Gary Kramlich <grim@reaperworld.com>
parents: 16238
diff changeset
2157 NULL,
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2158 NULL
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2159 };
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2160
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
2161 static void _init_plugin(PurplePlugin *plugin)
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2162 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
2163 PurpleAccountUserSplit *split;
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
2164 PurpleAccountOption *option;
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2165
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
2166 split = purple_account_user_split_new(_("Server"), "", '@');
11396
468e60b682cd [gaim-migrate @ 13627]
Daniel Atallah <datallah@pidgin.im>
parents: 11383
diff changeset
2167 prpl_info.user_splits = g_list_append(prpl_info.user_splits, split);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2168
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
2169 option = purple_account_option_bool_new(_("Publish status (note: everyone may watch you)"), "dopublish", TRUE);
11345
48a2f93e47b6 [gaim-migrate @ 13562]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11341
diff changeset
2170 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
48a2f93e47b6 [gaim-migrate @ 13562]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11341
diff changeset
2171
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
2172 option = purple_account_option_int_new(_("Connect port"), "port", 0);
12730
f64fdbc34677 [gaim-migrate @ 15074]
Daniel Atallah <datallah@pidgin.im>
parents: 12689
diff changeset
2173 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
f64fdbc34677 [gaim-migrate @ 15074]
Daniel Atallah <datallah@pidgin.im>
parents: 12689
diff changeset
2174
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
2175 option = purple_account_option_bool_new(_("Use UDP"), "udp", FALSE);
11189
5ac07336091e [gaim-migrate @ 13307]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11181
diff changeset
2176 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
2177 option = purple_account_option_bool_new(_("Use proxy"), "useproxy", FALSE);
11210
95ba2527d7d1 [gaim-migrate @ 13341]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11194
diff changeset
2178 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
2179 option = purple_account_option_string_new(_("Proxy"), "proxy", "");
11210
95ba2527d7d1 [gaim-migrate @ 13341]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 11194
diff changeset
2180 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
2181 option = purple_account_option_string_new(_("Auth User"), "authuser", "");
13085
c80913901342 [gaim-migrate @ 15446]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13084
diff changeset
2182 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
2183 option = purple_account_option_string_new(_("Auth Domain"), "authdomain", "");
13085
c80913901342 [gaim-migrate @ 15446]
Thomas Butter <tbutter@users.sourceforge.net>
parents: 13084
diff changeset
2184 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
11181
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2185 }
e872a55b9524 [gaim-migrate @ 13292]
Thomas Butter <tbutter@users.sourceforge.net>
parents:
diff changeset
2186
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
2187 PURPLE_INIT_PLUGIN(simple, _init_plugin, info);

mercurial