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