Thu, 26 Jul 2007 15:21:23 +0000
Fix memory leak (also includes an efficiency rearrangement for the xmlnode parsing that has been sitting on my machine for a while).
| 11477 | 1 | /* |
| 15884 | 2 | * purple - Bonjour Protocol Plugin |
| 11477 | 3 | * |
| 15884 | 4 | * Purple is the legal property of its developers, whose names are too numerous |
| 11477 | 5 | * to list here. Please refer to the COPYRIGHT file distributed with this |
| 6 | * source distribution. | |
| 7 | * | |
| 8 | * This program is free software; you can redistribute it and/or modify | |
| 9 | * it under the terms of the GNU General Public License as published by | |
| 10 | * the Free Software Foundation; either version 2 of the License, or | |
| 11 | * (at your option) any later version. | |
| 12 | * | |
| 13 | * This program is distributed in the hope that it will be useful, | |
| 14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 16 | * GNU General Public License for more details. | |
| 17 | * | |
| 18 | * You should have received a copy of the GNU General Public License | |
| 19 | * along with this program; if not, write to the Free Software | |
| 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
| 21 | */ | |
|
11688
d5a7c35ddc80
[gaim-migrate @ 13974]
Daniel Atallah <datallah@pidgin.im>
parents:
11539
diff
changeset
|
22 | #ifndef _WIN32 |
| 11477 | 23 | #include <sys/socket.h> |
| 24 | #include <netinet/in.h> | |
| 25 | #include <arpa/inet.h> | |
|
11688
d5a7c35ddc80
[gaim-migrate @ 13974]
Daniel Atallah <datallah@pidgin.im>
parents:
11539
diff
changeset
|
26 | #else |
|
d5a7c35ddc80
[gaim-migrate @ 13974]
Daniel Atallah <datallah@pidgin.im>
parents:
11539
diff
changeset
|
27 | #include "libc_interface.h" |
|
d5a7c35ddc80
[gaim-migrate @ 13974]
Daniel Atallah <datallah@pidgin.im>
parents:
11539
diff
changeset
|
28 | #endif |
|
d5a7c35ddc80
[gaim-migrate @ 13974]
Daniel Atallah <datallah@pidgin.im>
parents:
11539
diff
changeset
|
29 | #include <sys/types.h> |
| 11477 | 30 | #include <glib.h> |
| 31 | #include <unistd.h> | |
| 32 | #include <fcntl.h> | |
| 33 | ||
|
18338
d3cb08f27e04
More compile fixes from rekkanoryo for G_GNUC_NULL_TERMINATED issues
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17699
diff
changeset
|
34 | #include "internal.h" |
| 11477 | 35 | #include "network.h" |
| 36 | #include "eventloop.h" | |
| 37 | #include "connection.h" | |
| 38 | #include "blist.h" | |
| 39 | #include "xmlnode.h" | |
| 40 | #include "debug.h" | |
| 41 | #include "notify.h" | |
| 42 | #include "util.h" | |
| 43 | ||
| 44 | #include "jabber.h" | |
| 45 | #include "bonjour.h" | |
| 46 | #include "buddy.h" | |
| 47 | ||
|
17661
96c6a21c4139
Send 'to' and 'from' attributes in the stream start message.
Daniel Atallah <datallah@pidgin.im>
parents:
17660
diff
changeset
|
48 | #define STREAM_END "</stream:stream>" |
|
96c6a21c4139
Send 'to' and 'from' attributes in the stream start message.
Daniel Atallah <datallah@pidgin.im>
parents:
17660
diff
changeset
|
49 | /* TODO: specify version='1.0' and send stream features */ |
|
96c6a21c4139
Send 'to' and 'from' attributes in the stream start message.
Daniel Atallah <datallah@pidgin.im>
parents:
17660
diff
changeset
|
50 | #define DOCTYPE "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" \ |
|
96c6a21c4139
Send 'to' and 'from' attributes in the stream start message.
Daniel Atallah <datallah@pidgin.im>
parents:
17660
diff
changeset
|
51 | "<stream:stream xmlns=\"jabber:client\" xmlns:stream=\"http://etherx.jabber.org/streams\" from=\"%s\" to=\"%s\">" |
|
96c6a21c4139
Send 'to' and 'from' attributes in the stream start message.
Daniel Atallah <datallah@pidgin.im>
parents:
17660
diff
changeset
|
52 | |
|
12443
ad94864144f8
[gaim-migrate @ 14750]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11830
diff
changeset
|
53 | #if 0 /* this isn't used anywhere... */ |
|
ad94864144f8
[gaim-migrate @ 14750]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11830
diff
changeset
|
54 | static const char * |
| 15884 | 55 | _font_size_purple_to_ichat(int size) |
| 11477 | 56 | { |
|
11826
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
57 | switch (size) { |
|
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
58 | case 1: |
|
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
59 | return "8"; |
|
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
60 | case 2: |
|
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
61 | return "10"; |
|
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
62 | case 3: |
|
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
63 | return "12"; |
|
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
64 | case 4: |
|
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
65 | return "14"; |
|
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
66 | case 5: |
|
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
67 | return "17"; |
|
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
68 | case 6: |
|
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
69 | return "21"; |
|
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
70 | case 7: |
|
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
71 | return "24"; |
| 11477 | 72 | } |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
73 | |
|
11826
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
74 | return "12"; |
| 11477 | 75 | } |
|
12443
ad94864144f8
[gaim-migrate @ 14750]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11830
diff
changeset
|
76 | #endif |
| 11477 | 77 | |
|
17662
233ff0515d7b
Consolidate BonjourJabberConversation creation and deletion.
Daniel Atallah <datallah@pidgin.im>
parents:
17661
diff
changeset
|
78 | static BonjourJabberConversation * |
|
17663
fd736a4d91a9
Close conversation connections when logging out of the Bonjour account. This also fixes leakage.
Daniel Atallah <datallah@pidgin.im>
parents:
17662
diff
changeset
|
79 | bonjour_jabber_conv_new() { |
|
17662
233ff0515d7b
Consolidate BonjourJabberConversation creation and deletion.
Daniel Atallah <datallah@pidgin.im>
parents:
17661
diff
changeset
|
80 | |
|
233ff0515d7b
Consolidate BonjourJabberConversation creation and deletion.
Daniel Atallah <datallah@pidgin.im>
parents:
17661
diff
changeset
|
81 | BonjourJabberConversation *bconv = g_new0(BonjourJabberConversation, 1); |
|
233ff0515d7b
Consolidate BonjourJabberConversation creation and deletion.
Daniel Atallah <datallah@pidgin.im>
parents:
17661
diff
changeset
|
82 | bconv->socket = -1; |
|
17665
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
83 | bconv->tx_buf = purple_circ_buffer_new(512); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
84 | bconv->tx_handler = -1; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
85 | bconv->rx_handler = -1; |
|
17662
233ff0515d7b
Consolidate BonjourJabberConversation creation and deletion.
Daniel Atallah <datallah@pidgin.im>
parents:
17661
diff
changeset
|
86 | |
|
233ff0515d7b
Consolidate BonjourJabberConversation creation and deletion.
Daniel Atallah <datallah@pidgin.im>
parents:
17661
diff
changeset
|
87 | return bconv; |
|
233ff0515d7b
Consolidate BonjourJabberConversation creation and deletion.
Daniel Atallah <datallah@pidgin.im>
parents:
17661
diff
changeset
|
88 | } |
|
233ff0515d7b
Consolidate BonjourJabberConversation creation and deletion.
Daniel Atallah <datallah@pidgin.im>
parents:
17661
diff
changeset
|
89 | |
|
17665
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
90 | |
|
12443
ad94864144f8
[gaim-migrate @ 14750]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11830
diff
changeset
|
91 | static const char * |
| 15884 | 92 | _font_size_ichat_to_purple(int size) |
| 11477 | 93 | { |
| 94 | if (size > 24) { | |
|
11826
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
95 | return "7"; |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
96 | } else if (size >= 21) { |
|
11826
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
97 | return "6"; |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
98 | } else if (size >= 17) { |
|
11826
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
99 | return "5"; |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
100 | } else if (size >= 14) { |
|
11826
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
101 | return "4"; |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
102 | } else if (size >= 12) { |
|
11826
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
103 | return "3"; |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
104 | } else if (size >= 10) { |
|
11826
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
105 | return "2"; |
| 11477 | 106 | } |
| 107 | ||
|
11826
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
108 | return "1"; |
| 11477 | 109 | } |
|
17633
b76241c02857
Some more Bonjour cleanup and leak fixing.
Daniel Atallah <datallah@pidgin.im>
parents:
17632
diff
changeset
|
110 | |
|
12443
ad94864144f8
[gaim-migrate @ 14750]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11830
diff
changeset
|
111 | static void |
|
17665
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
112 | _jabber_parse_and_write_message_to_ui(xmlnode *message_node, PurpleConnection *connection, PurpleBuddy *pb) |
| 11477 | 113 | { |
|
17660
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
114 | xmlnode *body_node, *html_node, *events_node; |
|
17633
b76241c02857
Some more Bonjour cleanup and leak fixing.
Daniel Atallah <datallah@pidgin.im>
parents:
17632
diff
changeset
|
115 | char *body, *html_body = NULL; |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
116 | const char *ichat_balloon_color = NULL; |
|
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
117 | const char *ichat_text_color = NULL; |
|
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
118 | const char *font_face = NULL; |
|
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
119 | const char *font_size = NULL; |
|
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
120 | const char *font_color = NULL; |
| 11477 | 121 | gboolean composing_event = FALSE; |
| 122 | ||
|
17660
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
123 | body_node = xmlnode_get_child(message_node, "body"); |
|
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
124 | if (body_node == NULL) |
| 11477 | 125 | return; |
|
17633
b76241c02857
Some more Bonjour cleanup and leak fixing.
Daniel Atallah <datallah@pidgin.im>
parents:
17632
diff
changeset
|
126 | body = xmlnode_get_data(body_node); |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
127 | |
| 11477 | 128 | html_node = xmlnode_get_child(message_node, "html"); |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
129 | if (html_node != NULL) |
|
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
130 | { |
|
17633
b76241c02857
Some more Bonjour cleanup and leak fixing.
Daniel Atallah <datallah@pidgin.im>
parents:
17632
diff
changeset
|
131 | xmlnode *html_body_node; |
|
b76241c02857
Some more Bonjour cleanup and leak fixing.
Daniel Atallah <datallah@pidgin.im>
parents:
17632
diff
changeset
|
132 | |
| 11477 | 133 | html_body_node = xmlnode_get_child(html_node, "body"); |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
134 | if (html_body_node != NULL) |
|
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
135 | { |
|
17633
b76241c02857
Some more Bonjour cleanup and leak fixing.
Daniel Atallah <datallah@pidgin.im>
parents:
17632
diff
changeset
|
136 | xmlnode *html_body_font_node; |
|
b76241c02857
Some more Bonjour cleanup and leak fixing.
Daniel Atallah <datallah@pidgin.im>
parents:
17632
diff
changeset
|
137 | |
| 11477 | 138 | ichat_balloon_color = xmlnode_get_attrib(html_body_node, "ichatballooncolor"); |
| 139 | ichat_text_color = xmlnode_get_attrib(html_body_node, "ichattextcolor"); | |
| 140 | html_body_font_node = xmlnode_get_child(html_body_node, "font"); | |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
141 | if (html_body_font_node != NULL) |
|
11826
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
142 | { /* Types of messages sent by iChat */ |
| 11477 | 143 | font_face = xmlnode_get_attrib(html_body_font_node, "face"); |
|
11826
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
144 | /* The absolute iChat font sizes should be converted to 1..7 range */ |
| 11477 | 145 | font_size = xmlnode_get_attrib(html_body_font_node, "ABSZ"); |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
146 | if (font_size != NULL) |
| 15884 | 147 | font_size = _font_size_ichat_to_purple(atoi(font_size)); |
| 11477 | 148 | font_color = xmlnode_get_attrib(html_body_font_node, "color"); |
| 149 | html_body = xmlnode_get_data(html_body_font_node); | |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
150 | if (html_body == NULL) |
| 15884 | 151 | /* This is the kind of formated messages that Purple creates */ |
|
17660
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
152 | html_body = xmlnode_to_str(html_body_font_node, NULL); |
| 11477 | 153 | } |
| 154 | } | |
| 155 | } | |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
156 | |
| 11477 | 157 | events_node = xmlnode_get_child_with_namespace(message_node, "x", "jabber:x:event"); |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
158 | if (events_node != NULL) |
|
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
159 | { |
|
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
160 | if (xmlnode_get_child(events_node, "composing") != NULL) |
| 11477 | 161 | composing_event = TRUE; |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
162 | if (xmlnode_get_child(events_node, "id") != NULL) |
|
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
163 | { |
|
11826
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
164 | /* The user is just typing */ |
|
17633
b76241c02857
Some more Bonjour cleanup and leak fixing.
Daniel Atallah <datallah@pidgin.im>
parents:
17632
diff
changeset
|
165 | /* TODO: Deal with typing notification */ |
| 11477 | 166 | g_free(body); |
| 167 | g_free(html_body); | |
| 168 | return; | |
| 169 | } | |
| 170 | } | |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
171 | |
|
11826
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
172 | /* Compose the message */ |
|
17633
b76241c02857
Some more Bonjour cleanup and leak fixing.
Daniel Atallah <datallah@pidgin.im>
parents:
17632
diff
changeset
|
173 | if (html_body != NULL) |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
174 | { |
|
17633
b76241c02857
Some more Bonjour cleanup and leak fixing.
Daniel Atallah <datallah@pidgin.im>
parents:
17632
diff
changeset
|
175 | g_free(body); |
|
b76241c02857
Some more Bonjour cleanup and leak fixing.
Daniel Atallah <datallah@pidgin.im>
parents:
17632
diff
changeset
|
176 | |
| 11477 | 177 | if (font_face == NULL) font_face = "Helvetica"; |
| 178 | if (font_size == NULL) font_size = "3"; | |
| 179 | if (ichat_text_color == NULL) ichat_text_color = "#000000"; | |
| 180 | if (ichat_balloon_color == NULL) ichat_balloon_color = "#FFFFFF"; | |
|
17660
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
181 | body = g_strdup_printf("<font face='%s' size='%s' color='%s' back='%s'>%s</font>", |
|
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
182 | font_face, font_size, ichat_text_color, ichat_balloon_color, |
|
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
183 | html_body); |
| 11477 | 184 | } |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
185 | |
|
17633
b76241c02857
Some more Bonjour cleanup and leak fixing.
Daniel Atallah <datallah@pidgin.im>
parents:
17632
diff
changeset
|
186 | /* TODO: Should we do something with "composing_event" here? */ |
|
b76241c02857
Some more Bonjour cleanup and leak fixing.
Daniel Atallah <datallah@pidgin.im>
parents:
17632
diff
changeset
|
187 | |
|
11826
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
188 | /* Send the message to the UI */ |
|
17665
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
189 | serv_got_im(connection, pb->name, body, 0, time(NULL)); |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
190 | |
| 11477 | 191 | g_free(body); |
| 192 | g_free(html_body); | |
| 193 | } | |
| 194 | ||
| 12708 | 195 | struct _check_buddy_by_address_t { |
|
17633
b76241c02857
Some more Bonjour cleanup and leak fixing.
Daniel Atallah <datallah@pidgin.im>
parents:
17632
diff
changeset
|
196 | const char *address; |
|
17661
96c6a21c4139
Send 'to' and 'from' attributes in the stream start message.
Daniel Atallah <datallah@pidgin.im>
parents:
17660
diff
changeset
|
197 | PurpleBuddy **pb; |
| 13962 | 198 | BonjourJabber *bj; |
| 12708 | 199 | }; |
| 200 | ||
| 201 | static void | |
| 202 | _check_buddy_by_address(gpointer key, gpointer value, gpointer data) | |
| 11477 | 203 | { |
|
17661
96c6a21c4139
Send 'to' and 'from' attributes in the stream start message.
Daniel Atallah <datallah@pidgin.im>
parents:
17660
diff
changeset
|
204 | PurpleBuddy *pb = value; |
| 13962 | 205 | BonjourBuddy *bb; |
|
17633
b76241c02857
Some more Bonjour cleanup and leak fixing.
Daniel Atallah <datallah@pidgin.im>
parents:
17632
diff
changeset
|
206 | struct _check_buddy_by_address_t *cbba = data; |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
207 | |
| 13962 | 208 | /* |
| 15884 | 209 | * If the current PurpleBuddy's data is not null and the PurpleBuddy's account |
| 13962 | 210 | * is the same as the account requesting the check then continue to determine |
| 211 | * whether the buddies IP matches the target IP. | |
| 212 | */ | |
|
17661
96c6a21c4139
Send 'to' and 'from' attributes in the stream start message.
Daniel Atallah <datallah@pidgin.im>
parents:
17660
diff
changeset
|
213 | if (cbba->bj->account == pb->account) |
| 13962 | 214 | { |
|
17661
96c6a21c4139
Send 'to' and 'from' attributes in the stream start message.
Daniel Atallah <datallah@pidgin.im>
parents:
17660
diff
changeset
|
215 | bb = pb->proto_data; |
|
17155
143ff2796376
Replace strcasecmp() calls with glib equivalents.
Richard Laager <rlaager@pidgin.im>
parents:
15884
diff
changeset
|
216 | if ((bb != NULL) && (g_ascii_strcasecmp(bb->ip, cbba->address) == 0)) |
|
17661
96c6a21c4139
Send 'to' and 'from' attributes in the stream start message.
Daniel Atallah <datallah@pidgin.im>
parents:
17660
diff
changeset
|
217 | *(cbba->pb) = pb; |
| 11477 | 218 | } |
| 219 | } | |
| 220 | ||
|
12443
ad94864144f8
[gaim-migrate @ 14750]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11830
diff
changeset
|
221 | static gint |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
222 | _read_data(gint socket, char **message) |
| 11477 | 223 | { |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
224 | GString *data = g_string_new(""); |
|
13006
2e2ca7e0c716
[gaim-migrate @ 15359]
Daniel Atallah <datallah@pidgin.im>
parents:
12733
diff
changeset
|
225 | char partial_data[512]; |
| 11477 | 226 | gint total_message_length = 0; |
|
13006
2e2ca7e0c716
[gaim-migrate @ 15359]
Daniel Atallah <datallah@pidgin.im>
parents:
12733
diff
changeset
|
227 | gint partial_message_length = 0; |
| 11477 | 228 | |
|
11826
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
229 | /* Read chunks of 512 bytes till the end of the data */ |
|
13006
2e2ca7e0c716
[gaim-migrate @ 15359]
Daniel Atallah <datallah@pidgin.im>
parents:
12733
diff
changeset
|
230 | while ((partial_message_length = recv(socket, partial_data, 512, 0)) > 0) |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
231 | { |
|
17607
4d7a1c0f169b
Improve error handling while connecting to a bonjour buddy.
Daniel Atallah <datallah@pidgin.im>
parents:
17596
diff
changeset
|
232 | g_string_append_len(data, partial_data, partial_message_length); |
|
4d7a1c0f169b
Improve error handling while connecting to a bonjour buddy.
Daniel Atallah <datallah@pidgin.im>
parents:
17596
diff
changeset
|
233 | total_message_length += partial_message_length; |
| 11477 | 234 | } |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
235 | |
|
13006
2e2ca7e0c716
[gaim-migrate @ 15359]
Daniel Atallah <datallah@pidgin.im>
parents:
12733
diff
changeset
|
236 | if (partial_message_length == -1) |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
237 | { |
|
17633
b76241c02857
Some more Bonjour cleanup and leak fixing.
Daniel Atallah <datallah@pidgin.im>
parents:
17632
diff
changeset
|
238 | if (errno != EAGAIN) |
|
b76241c02857
Some more Bonjour cleanup and leak fixing.
Daniel Atallah <datallah@pidgin.im>
parents:
17632
diff
changeset
|
239 | purple_debug_warning("bonjour", "receive error: %s\n", strerror(errno)); |
| 11477 | 240 | if (total_message_length == 0) { |
| 241 | return -1; | |
| 242 | } | |
| 243 | } | |
| 244 | ||
|
17633
b76241c02857
Some more Bonjour cleanup and leak fixing.
Daniel Atallah <datallah@pidgin.im>
parents:
17632
diff
changeset
|
245 | *message = g_string_free(data, FALSE); |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
246 | if (total_message_length != 0) |
| 15884 | 247 | purple_debug_info("bonjour", "Receive: -%s- %d bytes\n", *message, total_message_length); |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
248 | |
| 11477 | 249 | return total_message_length; |
| 250 | } | |
| 251 | ||
|
17665
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
252 | static void |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
253 | _send_data_write_cb(gpointer data, gint source, PurpleInputCondition cond) |
| 11477 | 254 | { |
|
17665
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
255 | PurpleBuddy *pb = data; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
256 | BonjourBuddy *bb = pb->proto_data; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
257 | BonjourJabberConversation *bconv = bb->conversation; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
258 | int ret, writelen; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
259 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
260 | /* TODO: Make sure that the stream has been established before sending */ |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
261 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
262 | writelen = purple_circ_buffer_get_max_read(bconv->tx_buf); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
263 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
264 | if (writelen == 0) { |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
265 | purple_input_remove(bconv->tx_handler); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
266 | bconv->tx_handler = -1; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
267 | return; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
268 | } |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
269 | |
|
17665
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
270 | ret = send(bconv->socket, bconv->tx_buf->outptr, writelen, 0); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
271 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
272 | if (ret < 0 && errno == EAGAIN) |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
273 | return; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
274 | else if (ret <= 0) { |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
275 | PurpleConversation *conv; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
276 | const char *error = strerror(errno); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
277 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
278 | purple_debug_error("bonjour", "Error sending message to buddy %s error: %s\n", |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
279 | purple_buddy_get_name(pb), error ? error : "(null)"); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
280 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
281 | conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, bb->name, pb->account); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
282 | if (conv != NULL) |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
283 | purple_conversation_write(conv, NULL, |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
284 | _("Unable to send message."), |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
285 | PURPLE_MESSAGE_SYSTEM, time(NULL)); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
286 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
287 | bonjour_jabber_close_conversation(bb->conversation); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
288 | bb->conversation = NULL; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
289 | return; |
| 11477 | 290 | } |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
291 | |
|
17665
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
292 | purple_circ_buffer_mark_read(bconv->tx_buf, ret); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
293 | } |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
294 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
295 | static gint |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
296 | _send_data(PurpleBuddy *pb, char *message) |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
297 | { |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
298 | gint ret; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
299 | int len = strlen(message); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
300 | BonjourBuddy *bb = pb->proto_data; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
301 | BonjourJabberConversation *bconv = bb->conversation; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
302 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
303 | /* If we're not ready to actually send, append it to the buffer */ |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
304 | if (bconv->tx_handler != -1 |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
305 | || bconv->connect_data != NULL |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
306 | || !bconv->stream_started |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
307 | || purple_circ_buffer_get_max_read(bconv->tx_buf) > 0) { |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
308 | ret = -1; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
309 | errno = EAGAIN; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
310 | } else { |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
311 | ret = send(bconv->socket, message, len, 0); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
312 | } |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
313 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
314 | if (ret == -1 && errno == EAGAIN) |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
315 | ret = 0; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
316 | else if (ret <= 0) { |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
317 | PurpleConversation *conv; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
318 | const char *error = strerror(errno); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
319 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
320 | purple_debug_error("bonjour", "Error sending message to buddy %s error: %s\n", |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
321 | purple_buddy_get_name(pb), error ? error : "(null)"); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
322 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
323 | conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, bb->name, pb->account); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
324 | if (conv != NULL) |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
325 | purple_conversation_write(conv, NULL, |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
326 | _("Unable to send message."), |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
327 | PURPLE_MESSAGE_SYSTEM, time(NULL)); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
328 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
329 | bonjour_jabber_close_conversation(bb->conversation); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
330 | bb->conversation = NULL; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
331 | return -1; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
332 | } |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
333 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
334 | if (ret < len) { |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
335 | if (bconv->tx_handler == -1) |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
336 | bconv->tx_handler = purple_input_add(bconv->socket, PURPLE_INPUT_WRITE, |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
337 | _send_data_write_cb, pb); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
338 | purple_circ_buffer_append(bconv->tx_buf, message + ret, len - ret); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
339 | } |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
340 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
341 | return ret; |
| 11477 | 342 | } |
| 343 | ||
|
12443
ad94864144f8
[gaim-migrate @ 14750]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11830
diff
changeset
|
344 | static void |
| 15884 | 345 | _client_socket_handler(gpointer data, gint socket, PurpleInputCondition condition) |
| 11477 | 346 | { |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
347 | char *message = NULL; |
| 11477 | 348 | gint message_length; |
|
17661
96c6a21c4139
Send 'to' and 'from' attributes in the stream start message.
Daniel Atallah <datallah@pidgin.im>
parents:
17660
diff
changeset
|
349 | PurpleBuddy *pb = data; |
|
96c6a21c4139
Send 'to' and 'from' attributes in the stream start message.
Daniel Atallah <datallah@pidgin.im>
parents:
17660
diff
changeset
|
350 | PurpleAccount *account = pb->account; |
|
96c6a21c4139
Send 'to' and 'from' attributes in the stream start message.
Daniel Atallah <datallah@pidgin.im>
parents:
17660
diff
changeset
|
351 | BonjourBuddy *bb = pb->proto_data; |
| 11477 | 352 | gboolean closed_conversation = FALSE; |
| 353 | ||
|
11826
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
354 | /* Read the data from the socket */ |
| 11477 | 355 | if ((message_length = _read_data(socket, &message)) == -1) { |
|
11826
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
356 | /* There have been an error reading from the socket */ |
|
17665
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
357 | if (errno != EAGAIN) { |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
358 | bonjour_jabber_close_conversation(bb->conversation); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
359 | bb->conversation = NULL; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
360 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
361 | /* I guess we really don't need to notify the user. |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
362 | * If they try to send another message it'll reconnect */ |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
363 | } |
| 11477 | 364 | return; |
|
11826
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
365 | } else if (message_length == 0) { /* The other end has closed the socket */ |
| 11477 | 366 | closed_conversation = TRUE; |
| 367 | } else { | |
| 368 | message[message_length] = '\0'; | |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
369 | |
| 11477 | 370 | while (g_ascii_iscntrl(message[message_length - 1])) { |
| 371 | message[message_length - 1] = '\0'; | |
| 372 | message_length--; | |
| 373 | } | |
| 374 | } | |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
375 | |
| 13964 | 376 | /* |
| 377 | * Check that this is not the end of the conversation. This is | |
| 378 | * using a magic string, but xmlnode won't play nice when just | |
| 379 | * parsing an end tag | |
| 380 | */ | |
|
17660
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
381 | if (closed_conversation || purple_str_has_prefix(message, STREAM_END)) { |
|
17665
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
382 | PurpleConversation *conv; |
|
17633
b76241c02857
Some more Bonjour cleanup and leak fixing.
Daniel Atallah <datallah@pidgin.im>
parents:
17632
diff
changeset
|
383 | |
|
11826
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
384 | /* Close the socket, clear the watcher and free memory */ |
|
17663
fd736a4d91a9
Close conversation connections when logging out of the Bonjour account. This also fixes leakage.
Daniel Atallah <datallah@pidgin.im>
parents:
17662
diff
changeset
|
385 | bonjour_jabber_close_conversation(bb->conversation); |
|
fd736a4d91a9
Close conversation connections when logging out of the Bonjour account. This also fixes leakage.
Daniel Atallah <datallah@pidgin.im>
parents:
17662
diff
changeset
|
386 | bb->conversation = NULL; |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
387 | |
|
11826
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
388 | /* Inform the user that the conversation has been closed */ |
|
17665
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
389 | conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, pb->name, account); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
390 | if (conv != NULL) { |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
391 | char *tmp = g_strdup_printf(_("%s has closed the conversation."), pb->name); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
392 | purple_conversation_write(conv, NULL, tmp, PURPLE_MESSAGE_SYSTEM, time(NULL)); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
393 | g_free(tmp); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
394 | } |
|
17660
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
395 | } else { |
|
18947
bb754041e5b4
Fix memory leak (also includes an efficiency rearrangement for the xmlnode parsing that has been sitting on my machine for a while).
Daniel Atallah <datallah@pidgin.im>
parents:
18338
diff
changeset
|
396 | xmlnode *message_node; |
|
bb754041e5b4
Fix memory leak (also includes an efficiency rearrangement for the xmlnode parsing that has been sitting on my machine for a while).
Daniel Atallah <datallah@pidgin.im>
parents:
18338
diff
changeset
|
397 | |
|
bb754041e5b4
Fix memory leak (also includes an efficiency rearrangement for the xmlnode parsing that has been sitting on my machine for a while).
Daniel Atallah <datallah@pidgin.im>
parents:
18338
diff
changeset
|
398 | /* Parse the message into an XMLnode for analysis */ |
|
bb754041e5b4
Fix memory leak (also includes an efficiency rearrangement for the xmlnode parsing that has been sitting on my machine for a while).
Daniel Atallah <datallah@pidgin.im>
parents:
18338
diff
changeset
|
399 | message_node = xmlnode_from_str(message, strlen(message)); |
|
bb754041e5b4
Fix memory leak (also includes an efficiency rearrangement for the xmlnode parsing that has been sitting on my machine for a while).
Daniel Atallah <datallah@pidgin.im>
parents:
18338
diff
changeset
|
400 | |
|
bb754041e5b4
Fix memory leak (also includes an efficiency rearrangement for the xmlnode parsing that has been sitting on my machine for a while).
Daniel Atallah <datallah@pidgin.im>
parents:
18338
diff
changeset
|
401 | if (message_node != NULL) { |
|
bb754041e5b4
Fix memory leak (also includes an efficiency rearrangement for the xmlnode parsing that has been sitting on my machine for a while).
Daniel Atallah <datallah@pidgin.im>
parents:
18338
diff
changeset
|
402 | /* Parse the message to get the data and send to the ui */ |
|
bb754041e5b4
Fix memory leak (also includes an efficiency rearrangement for the xmlnode parsing that has been sitting on my machine for a while).
Daniel Atallah <datallah@pidgin.im>
parents:
18338
diff
changeset
|
403 | _jabber_parse_and_write_message_to_ui(message_node, account->gc, pb); |
|
bb754041e5b4
Fix memory leak (also includes an efficiency rearrangement for the xmlnode parsing that has been sitting on my machine for a while).
Daniel Atallah <datallah@pidgin.im>
parents:
18338
diff
changeset
|
404 | xmlnode_free(message_node); |
|
bb754041e5b4
Fix memory leak (also includes an efficiency rearrangement for the xmlnode parsing that has been sitting on my machine for a while).
Daniel Atallah <datallah@pidgin.im>
parents:
18338
diff
changeset
|
405 | } else { |
|
bb754041e5b4
Fix memory leak (also includes an efficiency rearrangement for the xmlnode parsing that has been sitting on my machine for a while).
Daniel Atallah <datallah@pidgin.im>
parents:
18338
diff
changeset
|
406 | /* TODO: Deal with receiving only a partial message */ |
|
bb754041e5b4
Fix memory leak (also includes an efficiency rearrangement for the xmlnode parsing that has been sitting on my machine for a while).
Daniel Atallah <datallah@pidgin.im>
parents:
18338
diff
changeset
|
407 | } |
| 11477 | 408 | } |
| 13964 | 409 | |
|
17660
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
410 | g_free(message); |
| 11477 | 411 | } |
| 412 | ||
|
17665
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
413 | struct _stream_start_data { |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
414 | char *msg; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
415 | PurpleInputFunction tx_handler_cb; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
416 | }; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
417 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
418 | static void |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
419 | _start_stream(gpointer data, gint source, PurpleInputCondition condition) |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
420 | { |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
421 | PurpleBuddy *pb = data; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
422 | BonjourBuddy *bb = pb->proto_data; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
423 | struct _stream_start_data *ss = bb->conversation->stream_data; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
424 | int len, ret; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
425 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
426 | len = strlen(ss->msg); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
427 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
428 | /* Start Stream */ |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
429 | ret = send(source, ss->msg, len, 0); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
430 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
431 | if (ret == -1 && errno == EAGAIN) |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
432 | return; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
433 | else if (ret <= 0) { |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
434 | const char *err = strerror(errno); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
435 | PurpleConversation *conv; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
436 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
437 | purple_debug_error("bonjour", "Error starting stream with buddy %s at %s:%d error: %s\n", |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
438 | purple_buddy_get_name(pb), bb->ip ? bb->ip : "(null)", bb->port_p2pj, err ? err : "(null)"); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
439 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
440 | conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, bb->name, pb->account); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
441 | if (conv != NULL) |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
442 | purple_conversation_write(conv, NULL, |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
443 | _("Unable to send the message, the conversation couldn't be started."), |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
444 | PURPLE_MESSAGE_SYSTEM, time(NULL)); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
445 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
446 | bonjour_jabber_close_conversation(bb->conversation); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
447 | bb->conversation = NULL; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
448 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
449 | return; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
450 | } |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
451 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
452 | /* This is EXTREMELY unlikely to happen */ |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
453 | if (ret < len) { |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
454 | char *tmp = g_strdup(ss->msg + ret); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
455 | g_free(ss->msg); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
456 | ss->msg = tmp; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
457 | return; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
458 | } |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
459 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
460 | /* Stream started; process the send buffer if there is one*/ |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
461 | purple_input_remove(bb->conversation->tx_handler); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
462 | bb->conversation->tx_handler= -1; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
463 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
464 | bb->conversation->stream_started = TRUE; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
465 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
466 | g_free(ss->msg); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
467 | g_free(ss); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
468 | bb->conversation->stream_data = NULL; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
469 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
470 | if (ss->tx_handler_cb) { |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
471 | bb->conversation->tx_handler = purple_input_add(source, PURPLE_INPUT_WRITE, |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
472 | ss->tx_handler_cb, pb); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
473 | /* We can probably write the data now. */ |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
474 | (ss->tx_handler_cb)(pb, source, PURPLE_INPUT_WRITE); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
475 | } |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
476 | } |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
477 | |
|
12443
ad94864144f8
[gaim-migrate @ 14750]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11830
diff
changeset
|
478 | static void |
| 15884 | 479 | _server_socket_handler(gpointer data, int server_socket, PurpleInputCondition condition) |
| 11477 | 480 | { |
|
17661
96c6a21c4139
Send 'to' and 'from' attributes in the stream start message.
Daniel Atallah <datallah@pidgin.im>
parents:
17660
diff
changeset
|
481 | PurpleBuddy *pb = NULL; |
|
11826
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
482 | struct sockaddr_in their_addr; /* connector's address information */ |
|
11515
09651c1daa98
[gaim-migrate @ 13760]
Mark Doliner <markdoliner@pidgin.im>
parents:
11498
diff
changeset
|
483 | socklen_t sin_size = sizeof(struct sockaddr); |
| 11477 | 484 | int client_socket; |
|
17633
b76241c02857
Some more Bonjour cleanup and leak fixing.
Daniel Atallah <datallah@pidgin.im>
parents:
17632
diff
changeset
|
485 | BonjourBuddy *bb; |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
486 | char *address_text = NULL; |
| 15884 | 487 | PurpleBuddyList *bl = purple_get_blist(); |
|
12733
0c1de18b51ed
[gaim-migrate @ 15077]
Mark Doliner <markdoliner@pidgin.im>
parents:
12730
diff
changeset
|
488 | struct _check_buddy_by_address_t *cbba; |
| 11477 | 489 | |
|
11826
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
490 | /* Check that it is a read condition */ |
|
17633
b76241c02857
Some more Bonjour cleanup and leak fixing.
Daniel Atallah <datallah@pidgin.im>
parents:
17632
diff
changeset
|
491 | if (condition != PURPLE_INPUT_READ) |
| 11477 | 492 | return; |
| 493 | ||
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
494 | if ((client_socket = accept(server_socket, (struct sockaddr *)&their_addr, &sin_size)) == -1) |
| 11477 | 495 | return; |
|
17633
b76241c02857
Some more Bonjour cleanup and leak fixing.
Daniel Atallah <datallah@pidgin.im>
parents:
17632
diff
changeset
|
496 | |
| 11477 | 497 | fcntl(client_socket, F_SETFL, O_NONBLOCK); |
| 498 | ||
| 13962 | 499 | /* Look for the buddy that has opened the conversation and fill information */ |
| 11477 | 500 | address_text = inet_ntoa(their_addr.sin_addr); |
|
12733
0c1de18b51ed
[gaim-migrate @ 15077]
Mark Doliner <markdoliner@pidgin.im>
parents:
12730
diff
changeset
|
501 | cbba = g_new0(struct _check_buddy_by_address_t, 1); |
| 12708 | 502 | cbba->address = address_text; |
|
17661
96c6a21c4139
Send 'to' and 'from' attributes in the stream start message.
Daniel Atallah <datallah@pidgin.im>
parents:
17660
diff
changeset
|
503 | cbba->pb = &pb; |
|
17633
b76241c02857
Some more Bonjour cleanup and leak fixing.
Daniel Atallah <datallah@pidgin.im>
parents:
17632
diff
changeset
|
504 | cbba->bj = data; |
|
13250
3857dfd699c5
[gaim-migrate @ 15615]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13006
diff
changeset
|
505 | g_hash_table_foreach(bl->buddies, _check_buddy_by_address, cbba); |
| 12708 | 506 | g_free(cbba); |
|
17661
96c6a21c4139
Send 'to' and 'from' attributes in the stream start message.
Daniel Atallah <datallah@pidgin.im>
parents:
17660
diff
changeset
|
507 | if (pb == NULL) |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
508 | { |
| 15884 | 509 | purple_debug_info("bonjour", "We don't like invisible buddies, this is not a superheros comic\n"); |
| 11477 | 510 | close(client_socket); |
| 511 | return; | |
| 512 | } | |
|
17661
96c6a21c4139
Send 'to' and 'from' attributes in the stream start message.
Daniel Atallah <datallah@pidgin.im>
parents:
17660
diff
changeset
|
513 | bb = pb->proto_data; |
| 11477 | 514 | |
|
11826
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
515 | /* Check if the conversation has been previously started */ |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
516 | if (bb->conversation == NULL) |
|
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
517 | { |
|
17665
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
518 | int ret, len; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
519 | char *stream_start = g_strdup_printf(DOCTYPE, purple_account_get_username(pb->account), |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
520 | purple_buddy_get_name(pb)); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
521 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
522 | len = strlen(stream_start); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
523 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
524 | /* Start the stream */ |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
525 | ret = send(client_socket, stream_start, len, 0); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
526 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
527 | if (ret == -1 && errno == EAGAIN) |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
528 | ret = 0; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
529 | else if (ret <= 0) { |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
530 | const char *err = strerror(errno); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
531 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
532 | purple_debug_error("bonjour", "Error starting stream with buddy %s at %s:%d error: %s\n", |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
533 | purple_buddy_get_name(pb), bb->ip ? bb->ip : "(null)", bb->port_p2pj, err ? err : "(null)"); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
534 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
535 | close(client_socket); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
536 | g_free(stream_start); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
537 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
538 | return; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
539 | } |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
540 | |
|
17663
fd736a4d91a9
Close conversation connections when logging out of the Bonjour account. This also fixes leakage.
Daniel Atallah <datallah@pidgin.im>
parents:
17662
diff
changeset
|
541 | bb->conversation = bonjour_jabber_conv_new(); |
| 11477 | 542 | bb->conversation->socket = client_socket; |
|
17665
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
543 | bb->conversation->rx_handler = purple_input_add(client_socket, |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
544 | PURPLE_INPUT_READ, _client_socket_handler, pb); |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
545 | |
|
17665
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
546 | /* This is unlikely to happen */ |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
547 | if (ret < len) { |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
548 | struct _stream_start_data *ss = g_new(struct _stream_start_data, 1); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
549 | ss->msg = g_strdup(stream_start + ret); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
550 | ss->tx_handler_cb = NULL; /* We have nothing to write yet */ |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
551 | bb->conversation->stream_data = ss; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
552 | /* Finish sending the stream start */ |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
553 | bb->conversation->tx_handler = purple_input_add(client_socket, |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
554 | PURPLE_INPUT_WRITE, _start_stream, pb); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
555 | } else { |
| 11477 | 556 | bb->conversation->stream_started = TRUE; |
| 557 | } | |
| 558 | ||
|
17665
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
559 | g_free(stream_start); |
| 11477 | 560 | } else { |
| 561 | close(client_socket); | |
| 562 | } | |
| 563 | } | |
| 564 | ||
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
565 | gint |
|
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
566 | bonjour_jabber_start(BonjourJabber *data) |
| 11477 | 567 | { |
| 568 | struct sockaddr_in my_addr; | |
| 569 | int yes = 1; | |
| 13971 | 570 | int i; |
| 571 | gboolean bind_successful; | |
| 11477 | 572 | |
|
11826
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
573 | /* Open a listening socket for incoming conversations */ |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
574 | if ((data->socket = socket(PF_INET, SOCK_STREAM, 0)) < 0) |
|
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
575 | { |
| 15884 | 576 | purple_debug_error("bonjour", "Cannot open socket: %s\n", strerror(errno)); |
| 577 | purple_connection_error(data->account->gc, _("Cannot open socket")); | |
| 11477 | 578 | return -1; |
| 579 | } | |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
580 | |
|
11826
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
581 | /* Make the socket reusable */ |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
582 | if (setsockopt(data->socket, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(int)) != 0) |
|
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
583 | { |
| 15884 | 584 | purple_debug_error("bonjour", "Error setting socket options: %s\n", strerror(errno)); |
| 585 | purple_connection_error(data->account->gc, _("Error setting socket options")); | |
| 11477 | 586 | return -1; |
| 587 | } | |
| 588 | ||
| 589 | memset(&my_addr, 0, sizeof(struct sockaddr_in)); | |
| 590 | my_addr.sin_family = PF_INET; | |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
591 | |
| 13971 | 592 | /* Attempt to find a free port */ |
| 593 | bind_successful = FALSE; | |
| 594 | for (i = 0; i < 10; i++) | |
| 595 | { | |
| 596 | my_addr.sin_port = htons(data->port); | |
| 597 | if (bind(data->socket, (struct sockaddr*)&my_addr, sizeof(struct sockaddr)) == 0) | |
| 598 | { | |
| 599 | bind_successful = TRUE; | |
| 600 | break; | |
| 601 | } | |
| 602 | data->port++; | |
| 603 | } | |
| 604 | ||
| 605 | /* On no! We tried 10 ports and could not bind to ANY of them */ | |
| 606 | if (!bind_successful) | |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
607 | { |
| 15884 | 608 | purple_debug_error("bonjour", "Cannot bind socket: %s\n", strerror(errno)); |
| 609 | purple_connection_error(data->account->gc, _("Could not bind socket to port")); | |
| 11477 | 610 | return -1; |
| 611 | } | |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
612 | |
| 13971 | 613 | /* Attempt to listen on the bound socket */ |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
614 | if (listen(data->socket, 10) != 0) |
|
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
615 | { |
| 15884 | 616 | purple_debug_error("bonjour", "Cannot listen on socket: %s\n", strerror(errno)); |
| 617 | purple_connection_error(data->account->gc, _("Could not listen on socket")); | |
| 11477 | 618 | return -1; |
| 619 | } | |
| 620 | ||
|
11826
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
621 | #if 0 |
|
12730
f64fdbc34677
[gaim-migrate @ 15074]
Daniel Atallah <datallah@pidgin.im>
parents:
12708
diff
changeset
|
622 | /* TODO: Why isn't this being used? */ |
| 15884 | 623 | data->socket = purple_network_listen(data->port, SOCK_STREAM); |
| 11477 | 624 | |
|
11826
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
625 | if (data->socket == -1) |
|
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
626 | { |
| 15884 | 627 | purple_debug_error("bonjour", "No se ha podido crear el socket\n"); |
|
11826
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
628 | } |
|
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
629 | #endif |
| 11477 | 630 | |
|
11826
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
631 | /* Open a watcher in the socket we have just opened */ |
| 15884 | 632 | data->watcher_id = purple_input_add(data->socket, PURPLE_INPUT_READ, _server_socket_handler, data); |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
633 | |
| 13971 | 634 | return data->port; |
| 11477 | 635 | } |
| 636 | ||
|
17665
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
637 | static void |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
638 | _connected_to_buddy(gpointer data, gint source, const gchar *error) |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
639 | { |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
640 | PurpleBuddy *pb = data; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
641 | BonjourBuddy *bb = pb->proto_data; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
642 | int len, ret; |
|
18947
bb754041e5b4
Fix memory leak (also includes an efficiency rearrangement for the xmlnode parsing that has been sitting on my machine for a while).
Daniel Atallah <datallah@pidgin.im>
parents:
18338
diff
changeset
|
643 | char *stream_start; |
|
17665
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
644 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
645 | bb->conversation->connect_data = NULL; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
646 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
647 | if (source < 0) { |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
648 | PurpleConversation *conv; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
649 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
650 | purple_debug_error("bonjour", "Error connecting to buddy %s at %s:%d error: %s\n", |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
651 | purple_buddy_get_name(pb), bb->ip ? bb->ip : "(null)", bb->port_p2pj, error ? error : "(null)"); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
652 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
653 | conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, bb->name, pb->account); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
654 | if (conv != NULL) |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
655 | purple_conversation_write(conv, NULL, |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
656 | _("Unable to send the message, the conversation couldn't be started."), |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
657 | PURPLE_MESSAGE_SYSTEM, time(NULL)); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
658 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
659 | bonjour_jabber_close_conversation(bb->conversation); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
660 | bb->conversation = NULL; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
661 | return; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
662 | } |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
663 | |
|
18947
bb754041e5b4
Fix memory leak (also includes an efficiency rearrangement for the xmlnode parsing that has been sitting on my machine for a while).
Daniel Atallah <datallah@pidgin.im>
parents:
18338
diff
changeset
|
664 | stream_start = g_strdup_printf(DOCTYPE, purple_account_get_username(pb->account), purple_buddy_get_name(pb)); |
|
17665
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
665 | len = strlen(stream_start); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
666 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
667 | /* Start the stream and send queued messages */ |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
668 | ret = send(source, stream_start, len, 0); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
669 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
670 | if (ret == -1 && errno == EAGAIN) |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
671 | ret = 0; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
672 | else if (ret <= 0) { |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
673 | const char *err = strerror(errno); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
674 | PurpleConversation *conv; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
675 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
676 | purple_debug_error("bonjour", "Error starting stream with buddy %s at %s:%d error: %s\n", |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
677 | purple_buddy_get_name(pb), bb->ip ? bb->ip : "(null)", bb->port_p2pj, err ? err : "(null)"); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
678 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
679 | conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, bb->name, pb->account); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
680 | if (conv != NULL) |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
681 | purple_conversation_write(conv, NULL, |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
682 | _("Unable to send the message, the conversation couldn't be started."), |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
683 | PURPLE_MESSAGE_SYSTEM, time(NULL)); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
684 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
685 | close(source); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
686 | bonjour_jabber_close_conversation(bb->conversation); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
687 | bb->conversation = NULL; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
688 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
689 | g_free(stream_start); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
690 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
691 | return; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
692 | } |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
693 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
694 | bb->conversation->socket = source; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
695 | bb->conversation->rx_handler = purple_input_add(source, |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
696 | PURPLE_INPUT_READ, _client_socket_handler, pb); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
697 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
698 | /* This is unlikely to happen */ |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
699 | if (ret < len) { |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
700 | struct _stream_start_data *ss = g_new(struct _stream_start_data, 1); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
701 | ss->msg = g_strdup(stream_start + ret); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
702 | ss->tx_handler_cb = _send_data_write_cb; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
703 | bb->conversation->stream_data = ss; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
704 | /* Finish sending the stream start */ |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
705 | bb->conversation->tx_handler = purple_input_add(source, |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
706 | PURPLE_INPUT_WRITE, _start_stream, pb); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
707 | } |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
708 | /* Process the send buffer */ |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
709 | else { |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
710 | bb->conversation->stream_started = TRUE; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
711 | /* Watch for when we can write the buffered messages */ |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
712 | bb->conversation->tx_handler = purple_input_add(source, PURPLE_INPUT_WRITE, |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
713 | _send_data_write_cb, pb); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
714 | /* We can probably write the data now. */ |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
715 | _send_data_write_cb(pb, source, PURPLE_INPUT_WRITE); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
716 | } |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
717 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
718 | g_free(stream_start); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
719 | } |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
720 | |
|
11693
1a42a66ca0f8
[gaim-migrate @ 13979]
Mark Doliner <markdoliner@pidgin.im>
parents:
11688
diff
changeset
|
721 | int |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
722 | bonjour_jabber_send_message(BonjourJabber *data, const gchar *to, const gchar *body) |
| 11477 | 723 | { |
|
17660
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
724 | xmlnode *message_node, *node, *node2; |
|
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
725 | gchar *message; |
|
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
726 | PurpleBuddy *pb; |
|
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
727 | BonjourBuddy *bb; |
|
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
728 | int ret; |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
729 | |
|
17660
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
730 | pb = purple_find_buddy(data->account, to); |
|
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
731 | if (pb == NULL) { |
|
17607
4d7a1c0f169b
Improve error handling while connecting to a bonjour buddy.
Daniel Atallah <datallah@pidgin.im>
parents:
17596
diff
changeset
|
732 | purple_debug_info("bonjour", "Can't send a message to an offline buddy (%s).\n", to); |
|
11693
1a42a66ca0f8
[gaim-migrate @ 13979]
Mark Doliner <markdoliner@pidgin.im>
parents:
11688
diff
changeset
|
733 | /* You can not send a message to an offline buddy */ |
|
1a42a66ca0f8
[gaim-migrate @ 13979]
Mark Doliner <markdoliner@pidgin.im>
parents:
11688
diff
changeset
|
734 | return -10000; |
|
17607
4d7a1c0f169b
Improve error handling while connecting to a bonjour buddy.
Daniel Atallah <datallah@pidgin.im>
parents:
17596
diff
changeset
|
735 | } |
|
11693
1a42a66ca0f8
[gaim-migrate @ 13979]
Mark Doliner <markdoliner@pidgin.im>
parents:
11688
diff
changeset
|
736 | |
|
17660
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
737 | bb = pb->proto_data; |
|
11693
1a42a66ca0f8
[gaim-migrate @ 13979]
Mark Doliner <markdoliner@pidgin.im>
parents:
11688
diff
changeset
|
738 | |
|
17607
4d7a1c0f169b
Improve error handling while connecting to a bonjour buddy.
Daniel Atallah <datallah@pidgin.im>
parents:
17596
diff
changeset
|
739 | /* Check if there is a previously open conversation */ |
|
4d7a1c0f169b
Improve error handling while connecting to a bonjour buddy.
Daniel Atallah <datallah@pidgin.im>
parents:
17596
diff
changeset
|
740 | if (bb->conversation == NULL) |
|
4d7a1c0f169b
Improve error handling while connecting to a bonjour buddy.
Daniel Atallah <datallah@pidgin.im>
parents:
17596
diff
changeset
|
741 | { |
|
17665
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
742 | PurpleProxyConnectData *connect_data; |
|
17699
ece5beaecd19
More robust hack to force Bonjour to use no proxy when directly connecting to buddy.
Daniel Atallah <datallah@pidgin.im>
parents:
17665
diff
changeset
|
743 | PurpleProxyInfo *proxy_info; |
|
17665
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
744 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
745 | /* Make sure that the account always has a proxy of "none". |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
746 | * This is kind of dirty, but proxy_connect_none() isn't exposed. */ |
|
17699
ece5beaecd19
More robust hack to force Bonjour to use no proxy when directly connecting to buddy.
Daniel Atallah <datallah@pidgin.im>
parents:
17665
diff
changeset
|
747 | proxy_info = purple_account_get_proxy_info(data->account); |
|
ece5beaecd19
More robust hack to force Bonjour to use no proxy when directly connecting to buddy.
Daniel Atallah <datallah@pidgin.im>
parents:
17665
diff
changeset
|
748 | if (proxy_info == NULL) { |
|
ece5beaecd19
More robust hack to force Bonjour to use no proxy when directly connecting to buddy.
Daniel Atallah <datallah@pidgin.im>
parents:
17665
diff
changeset
|
749 | proxy_info = purple_proxy_info_new(); |
|
ece5beaecd19
More robust hack to force Bonjour to use no proxy when directly connecting to buddy.
Daniel Atallah <datallah@pidgin.im>
parents:
17665
diff
changeset
|
750 | purple_account_set_proxy_info(data->account, proxy_info); |
|
17665
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
751 | } |
|
17699
ece5beaecd19
More robust hack to force Bonjour to use no proxy when directly connecting to buddy.
Daniel Atallah <datallah@pidgin.im>
parents:
17665
diff
changeset
|
752 | purple_proxy_info_set_type(proxy_info, PURPLE_PROXY_NONE); |
|
17665
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
753 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
754 | connect_data = |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
755 | purple_proxy_connect(data->account->gc, data->account, bb->ip, |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
756 | bb->port_p2pj, _connected_to_buddy, pb); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
757 | |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
758 | if (connect_data == NULL) { |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
759 | purple_debug_error("bonjour", "Unable to connect to buddy (%s).\n", to); |
|
17607
4d7a1c0f169b
Improve error handling while connecting to a bonjour buddy.
Daniel Atallah <datallah@pidgin.im>
parents:
17596
diff
changeset
|
760 | return -10001; |
|
17665
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
761 | } |
|
17607
4d7a1c0f169b
Improve error handling while connecting to a bonjour buddy.
Daniel Atallah <datallah@pidgin.im>
parents:
17596
diff
changeset
|
762 | |
|
17663
fd736a4d91a9
Close conversation connections when logging out of the Bonjour account. This also fixes leakage.
Daniel Atallah <datallah@pidgin.im>
parents:
17662
diff
changeset
|
763 | bb->conversation = bonjour_jabber_conv_new(); |
|
17665
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
764 | bb->conversation->connect_data = connect_data; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
765 | /* We don't want _send_data() to register the tx_handler; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
766 | * that neeeds to wait until we're actually connected. */ |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
767 | bb->conversation->tx_handler = 0; |
|
17607
4d7a1c0f169b
Improve error handling while connecting to a bonjour buddy.
Daniel Atallah <datallah@pidgin.im>
parents:
17596
diff
changeset
|
768 | } |
|
4d7a1c0f169b
Improve error handling while connecting to a bonjour buddy.
Daniel Atallah <datallah@pidgin.im>
parents:
17596
diff
changeset
|
769 | |
|
17660
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
770 | message_node = xmlnode_new("message"); |
|
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
771 | xmlnode_set_attrib(message_node, "to", bb->name); |
|
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
772 | xmlnode_set_attrib(message_node, "from", purple_account_get_username(data->account)); |
|
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
773 | xmlnode_set_attrib(message_node, "type", "chat"); |
|
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
774 | |
|
11826
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
775 | /* Enclose the message from the UI within a "font" node */ |
|
17660
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
776 | node = xmlnode_new_child(message_node, "body"); |
|
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
777 | message = purple_markup_strip_html(body); |
|
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
778 | xmlnode_insert_data(node, message, strlen(message)); |
|
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
779 | g_free(message); |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
780 | |
|
17660
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
781 | node = xmlnode_new_child(message_node, "html"); |
|
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
782 | xmlnode_set_namespace(node, "http://www.w3.org/1999/xhtml"); |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
783 | |
|
17660
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
784 | node = xmlnode_new_child(node, "body"); |
|
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
785 | message = g_strdup_printf("<font>%s</font>", body); |
|
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
786 | node2 = xmlnode_from_str(message, strlen(message)); |
|
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
787 | g_free(message); |
|
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
788 | xmlnode_insert_child(node, node2); |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
789 | |
|
17660
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
790 | node = xmlnode_new_child(message_node, "x"); |
|
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
791 | xmlnode_set_namespace(node, "jabber:x:event"); |
|
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
792 | xmlnode_insert_child(node, xmlnode_new("composing")); |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
793 | |
|
17660
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
794 | message = xmlnode_to_str(message_node, NULL); |
|
15873
78d3aa0fb61e
plug some memory leaks
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
15435
diff
changeset
|
795 | xmlnode_free(message_node); |
| 11477 | 796 | |
|
17665
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
797 | ret = _send_data(pb, message) >= 0; |
|
17660
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
798 | |
|
15873
78d3aa0fb61e
plug some memory leaks
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
15435
diff
changeset
|
799 | g_free(message); |
|
78d3aa0fb61e
plug some memory leaks
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
15435
diff
changeset
|
800 | |
|
17665
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
801 | return ret; |
| 11477 | 802 | } |
| 803 | ||
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
804 | void |
|
17663
fd736a4d91a9
Close conversation connections when logging out of the Bonjour account. This also fixes leakage.
Daniel Atallah <datallah@pidgin.im>
parents:
17662
diff
changeset
|
805 | bonjour_jabber_close_conversation(BonjourJabberConversation *bconv) |
| 11477 | 806 | { |
|
17660
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
807 | if (bconv != NULL) |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
808 | { |
|
11826
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
809 | /* Close the socket and remove the watcher */ |
|
17660
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
810 | if (bconv->socket >= 0) { |
|
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
811 | /* Send the end of the stream to the other end of the conversation */ |
|
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
812 | if (bconv->stream_started) |
|
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
813 | send(bconv->socket, STREAM_END, strlen(STREAM_END), 0); |
|
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
814 | /* TODO: We're really supposed to wait for "</stream:stream>" before closing the socket */ |
|
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
815 | close(bconv->socket); |
|
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
816 | } |
|
17665
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
817 | if (bconv->rx_handler != -1) |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
818 | purple_input_remove(bconv->rx_handler); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
819 | if (bconv->tx_handler > 0) |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
820 | purple_input_remove(bconv->tx_handler); |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
821 | |
|
11826
10ebbc41f163
[gaim-migrate @ 14117]
Richard Laager <rlaager@pidgin.im>
parents:
11823
diff
changeset
|
822 | /* Free all the data related to the conversation */ |
|
17665
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
823 | purple_circ_buffer_destroy(bconv->tx_buf); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
824 | if (bconv->connect_data != NULL) |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
825 | purple_proxy_connect_cancel(bconv->connect_data); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
826 | if (bconv->stream_data != NULL) { |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
827 | struct _stream_start_data *ss = bconv->stream_data; |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
828 | g_free(ss->msg); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
829 | g_free(ss); |
|
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
830 | } |
|
17660
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
831 | g_free(bconv); |
| 11477 | 832 | } |
| 833 | } | |
| 834 | ||
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
835 | void |
|
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
836 | bonjour_jabber_stop(BonjourJabber *data) |
| 11477 | 837 | { |
|
17633
b76241c02857
Some more Bonjour cleanup and leak fixing.
Daniel Atallah <datallah@pidgin.im>
parents:
17632
diff
changeset
|
838 | /* Close the server socket and remove the watcher */ |
|
17632
b27a15168d33
Improve Bonjour error handling when there are errors "connecting".
Daniel Atallah <datallah@pidgin.im>
parents:
17607
diff
changeset
|
839 | if (data->socket >= 0) |
|
b27a15168d33
Improve Bonjour error handling when there are errors "connecting".
Daniel Atallah <datallah@pidgin.im>
parents:
17607
diff
changeset
|
840 | close(data->socket); |
|
b27a15168d33
Improve Bonjour error handling when there are errors "connecting".
Daniel Atallah <datallah@pidgin.im>
parents:
17607
diff
changeset
|
841 | if (data->watcher_id > 0) |
|
b27a15168d33
Improve Bonjour error handling when there are errors "connecting".
Daniel Atallah <datallah@pidgin.im>
parents:
17607
diff
changeset
|
842 | purple_input_remove(data->watcher_id); |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
843 | |
|
17633
b76241c02857
Some more Bonjour cleanup and leak fixing.
Daniel Atallah <datallah@pidgin.im>
parents:
17632
diff
changeset
|
844 | /* Close all the conversation sockets and remove all the watchers after sending end streams */ |
|
11539
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
845 | if (data->account->gc != NULL) |
|
fbabe3f89777
[gaim-migrate @ 13794]
Mark Doliner <markdoliner@pidgin.im>
parents:
11515
diff
changeset
|
846 | { |
|
17660
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
847 | GSList *buddies, *l; |
|
17633
b76241c02857
Some more Bonjour cleanup and leak fixing.
Daniel Atallah <datallah@pidgin.im>
parents:
17632
diff
changeset
|
848 | |
|
17660
23c712d0a795
Cleanup, fix a leak and prevent the inbound xml from being parsed twice for every message.
Daniel Atallah <datallah@pidgin.im>
parents:
17633
diff
changeset
|
849 | buddies = purple_find_buddies(data->account, purple_account_get_username(data->account)); |
|
17663
fd736a4d91a9
Close conversation connections when logging out of the Bonjour account. This also fixes leakage.
Daniel Atallah <datallah@pidgin.im>
parents:
17662
diff
changeset
|
850 | for (l = buddies; l; l = l->next) { |
|
fd736a4d91a9
Close conversation connections when logging out of the Bonjour account. This also fixes leakage.
Daniel Atallah <datallah@pidgin.im>
parents:
17662
diff
changeset
|
851 | BonjourBuddy *bb = ((PurpleBuddy*) l->data)->proto_data; |
|
fd736a4d91a9
Close conversation connections when logging out of the Bonjour account. This also fixes leakage.
Daniel Atallah <datallah@pidgin.im>
parents:
17662
diff
changeset
|
852 | bonjour_jabber_close_conversation(bb->conversation); |
|
fd736a4d91a9
Close conversation connections when logging out of the Bonjour account. This also fixes leakage.
Daniel Atallah <datallah@pidgin.im>
parents:
17662
diff
changeset
|
853 | bb->conversation = NULL; |
|
fd736a4d91a9
Close conversation connections when logging out of the Bonjour account. This also fixes leakage.
Daniel Atallah <datallah@pidgin.im>
parents:
17662
diff
changeset
|
854 | } |
|
17665
26bff2090889
Update Bonjour to do nonblocking I/O correctly.
Daniel Atallah <datallah@pidgin.im>
parents:
17663
diff
changeset
|
855 | |
| 11477 | 856 | g_slist_free(buddies); |
| 857 | } | |
| 858 | } |