Use GSocket and GSocketAddress from GIO.

diff --git a/friend.c b/friend.c
index b7c3229..f749b4d 100644 (file)
--- a/friend.c
+++ b/friend.c
@@ -27,69 +27,32 @@
 #include <stdio.h>
 #include "message.h"
 
-static int connect_friend(struct sockaddr **saddr, char *address, uint16_t port)
-{
-       struct addrinfo *addresses;
-       struct addrinfo *addr;
-       struct addrinfo hint;
-       int r;
-       char sport[6];
-       snprintf(sport, sizeof(sport), "%us", port);
-       memset(&hint, 0, sizeof(hint));
-       hint.ai_family = AF_UNSPEC;
-       hint.ai_socktype = SOCK_STREAM;
-       hint.ai_protocol = IPPROTO_TCP;
-       hint.ai_flags = AI_ADDRCONFIG;
-       r = getaddrinfo(address, sport, &hint, &addresses);
-       if (r) {
-               return r;
-       }
-       if (addresses != NULL) {
-               *saddr = g_malloc(addresses->ai_addrlen);
-               if (!*saddr) {
-                       r = -1;
-               } else {
-                       memcpy(*saddr, addresses->ai_addr, addresses->ai_addrlen);
-               }
-       }
-       freeaddrinfo(addresses);
-       if (r == -1)
-               return EAI_SYSTEM;
-       return 0;
-}
-
 struct friend {
        char *name;
        char *address;
        uint16_t port;
-       struct sockaddr *saddr;
+       GInetSocketAddress *saddr;
 };
 
-static int usock;
+static GSocket *usock;
 
 int sock_init(void)
 {
-       struct sockaddr_in6 sa;
-       memset(&sa, 0, sizeof(sa));
-       sa.sin6_family = AF_INET6;
-       sa.sin6_port = htons(17078);
-       memcpy((void *) &sa.sin6_addr, (void *) &in6addr_any, sizeof(in6addr_any));
-       usock = socket(AF_INET6, SOCK_DGRAM, 0);
-       bind(usock, (struct sockaddr *) &sa, sizeof(sa));
+       GSocketAddress *address;
+       GInetAddress *any_addr;
+       any_addr = g_inet_address_new_any(G_SOCKET_FAMILY_IPV6);
+       usock = g_socket_new(G_SOCKET_FAMILY_IPV6, G_SOCKET_TYPE_DATAGRAM, G_SOCKET_PROTOCOL_UDP, NULL);
+       address = g_inet_socket_address_new(any_addr, 17078);
+       g_socket_bind(usock, address, TRUE, NULL);
+       g_object_unref(any_addr);
+       g_object_unref(address);
        message_init(usock);
        return 0;
 }
 
 int friend_send_message(struct friend *friend, char *buffer, size_t len)
 {
-       socklen_t sl;
-       if (friend->saddr->sa_family == AF_INET)
-               sl = sizeof(struct sockaddr_in);
-       else if (friend->saddr->sa_family == AF_INET6)
-               sl = sizeof(struct sockaddr_in6);
-       else
-               return -EAFNOSUPPORT;
-       sendto(usock, buffer, len, 0, friend->saddr, sl);
+       g_socket_send_to(usock, G_SOCKET_ADDRESS(friend->saddr), buffer, len, NULL, NULL);
        return 0;
 }
 
@@ -109,7 +72,7 @@ static void destroy_friend(gpointer data)
        struct friend *friend = data;
        g_free(friend->name);
        g_free(friend->address);
-       g_free(friend->saddr);
+       g_object_unref(friend->saddr);
        g_slice_free(struct friend, friend);
 }
 
@@ -123,11 +86,14 @@ int destroy_cache(struct cache *cache)
 int cache_add_friend(struct cache *cache, char *name, char *address, uint16_t port)
 {
        struct friend *friend;
+       GInetAddress *addr;
        friend = g_slice_new0(struct friend);
        friend->name = g_strdup(name);
        friend->address = g_strdup(address);
        friend->port = port;
-       connect_friend(&friend->saddr, friend->address, friend->port);
+       addr = g_inet_address_new_from_string(address);
+       friend->saddr = G_INET_SOCKET_ADDRESS(g_inet_socket_address_new(addr, friend->port));
+       g_object_unref(addr);
        cache->friends = g_list_append(cache->friends, friend);
        return 0;
 }

diff --git a/message.c b/message.c
index 7c73006..1a66892 100644 (file)
--- a/message.c
+++ b/message.c
@@ -58,9 +58,9 @@ gboolean message_incoming(GIOChannel *channel, GIOCondition cond, gpointer data)
        return TRUE;
 }
 
-int message_init(int sock)
+int message_init(GSocket *sock)
 {
-       uchannel = g_io_channel_unix_new(sock);
+       uchannel = g_io_channel_unix_new(g_socket_get_fd(sock));
        g_io_add_watch(uchannel, G_IO_IN, message_incoming, NULL);
        return 0;
 }

diff --git a/message.h b/message.h
index 80ed923..d2fbcc1 100644 (file)
--- a/message.h
+++ b/message.h
@@ -20,8 +20,9 @@
 #define _MESSAGE_H
 
 #include "friend.h"
+#include <gio/gio.h>
 
-int message_init(int sock);
+int message_init(GSocket *sock);
 int ping(struct friend *friend);
 
 #endif