Mercurial > pidgin.yaz
changeset 8546:9aa6017da568
[gaim-migrate @ 9288]
Might as well have this up to date with the small changes I'd made
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Thu, 01 Apr 2004 17:42:12 +0000 |
| parents | 07059ef55c9c |
| children | 9b2f06d7412a |
| files | src/protocols/rendezvous/.cvsignore src/protocols/rendezvous/mdns.c src/protocols/rendezvous/mdns.h src/protocols/rendezvous/rendezvous.c |
| diffstat | 4 files changed, 8 insertions(+), 29 deletions(-) [+] |
line wrap: on
line diff
--- a/src/protocols/rendezvous/.cvsignore Thu Apr 01 17:41:30 2004 +0000 +++ b/src/protocols/rendezvous/.cvsignore Thu Apr 01 17:42:12 2004 +0000 @@ -2,8 +2,8 @@ Makefile .deps .libs -librendezvous.la -rendezvous.lo librendezvous.def librendezvous.dll librendezvous.lib +*.la +*.lo
--- a/src/protocols/rendezvous/mdns.c Thu Apr 01 17:41:30 2004 +0000 +++ b/src/protocols/rendezvous/mdns.c Thu Apr 01 17:42:12 2004 +0000 @@ -34,18 +34,7 @@ * OVERFLOW SECURITY HOLES!!! */ -#include <errno.h> -#include <fcntl.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> -#include <arpa/inet.h> -#include <netinet/in.h> -#include <sys/socket.h> -#include <sys/types.h> - -#include <glib.h> - +#include "internal.h" #include "debug.h" #include "mdns.h"
--- a/src/protocols/rendezvous/mdns.h Thu Apr 01 17:41:30 2004 +0000 +++ b/src/protocols/rendezvous/mdns.h Thu Apr 01 17:42:12 2004 +0000 @@ -26,13 +26,7 @@ #ifndef _MDNS_H_ #define _MDNS_H_ -#include <errno.h> -#include <string.h> -#include <arpa/inet.h> -#include <netinet/in.h> -#include <sys/socket.h> -#include <sys/types.h> - +#include "internal.h" #include "debug.h" /*
--- a/src/protocols/rendezvous/rendezvous.c Thu Apr 01 17:41:30 2004 +0000 +++ b/src/protocols/rendezvous/rendezvous.c Thu Apr 01 17:42:12 2004 +0000 @@ -19,9 +19,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <glib.h> -#include <glib/gprintf.h> - #include "internal.h" #include "account.h" @@ -64,7 +61,7 @@ g_free(rb); } -/* +/** * Extract the "user@host" name from a full presence domain * of the form "user@host._presence._tcp.local" * @@ -127,6 +124,7 @@ serv_got_update(gc, b->name, 0, 0, 0, 0, 0); gaim_blist_remove_buddy(b); + /* XXX - This results in incorrect group counts--needs to be fixed in the core */ } static void rendezvous_removeallfromlocal(GaimConnection *gc) @@ -214,6 +212,8 @@ g_free(rb->msg); rb->msg = g_strdup(tmp1); } + + /* XXX - Use the TTL value of the rr to cause this data to expire */ } /* @@ -354,15 +354,12 @@ rd = g_new0(RendezvousData, 1); rd->buddies = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, rendezvous_buddy_free); - gc->proto_data = rd; gaim_connection_update_progress(gc, _("Preparing Buddy List"), 0, RENDEZVOUS_CONNECT_STEPS); - rendezvous_removeallfromlocal(gc); gaim_connection_update_progress(gc, _("Connecting"), 1, RENDEZVOUS_CONNECT_STEPS); - rd->fd = mdns_establish_socket(); if (rd->fd == -1) { gaim_connection_error(gc, _("Unable to login to rendezvous")); @@ -370,7 +367,6 @@ } gc->inpa = gaim_input_add(rd->fd, GAIM_INPUT_READ, rendezvous_callback, gc); - gaim_connection_set_state(gc, GAIM_CONNECTED); mdns_query(rd->fd, "_presence._tcp.local");