X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=friend.c;h=f749b4dc20ece9823e3c9bce528bf4e9a3651712;hb=a3de5aacf2ffb1543dc7b43e3cd6e81773d863c8;hp=dff03e265f4529332597f0e3188670571e159034;hpb=966597cb2c97b429ed9de6202b466981ad80cbba;p=cascardo%2Ff2fchat.git

diff --git a/friend.c b/friend.c
index dff03e2..f749b4d 100644
--- a/friend.c
+++ b/friend.c
@@ -23,43 +23,39 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
-
-static int connect_friend(struct sockaddr **saddr, char *address, char *port)
-{
-	struct addrinfo *addresses;
-	struct addrinfo *addr;
-	struct addrinfo hint;
-	int r;
-	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, port, &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;
-}
+#include <errno.h>
+#include <stdio.h>
+#include "message.h"
 
 struct friend {
 	char *name;
 	char *address;
-	char *port;
-	struct sockaddr *saddr;
+	uint16_t port;
+	GInetSocketAddress *saddr;
 };
 
+static GSocket *usock;
+
+int sock_init(void)
+{
+	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)
+{
+	g_socket_send_to(usock, G_SOCKET_ADDRESS(friend->saddr), buffer, len, NULL, NULL);
+	return 0;
+}
+
 struct cache {
 	GList *friends;
 };
@@ -76,8 +72,7 @@ static void destroy_friend(gpointer data)
 	struct friend *friend = data;
 	g_free(friend->name);
 	g_free(friend->address);
-	g_free(friend->port);
-	g_free(friend->saddr);
+	g_object_unref(friend->saddr);
 	g_slice_free(struct friend, friend);
 }
 
@@ -88,15 +83,18 @@ int destroy_cache(struct cache *cache)
 	g_slice_free(struct cache, cache);
 }
 
-int cache_add_friend(struct cache *cache, char *name, char *address, char *port)
+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 = g_strdup(port);
-	connect_friend(&friend->saddr, friend->address, friend->port);
-	g_list_append(cache->friends, friend);
+	friend->port = 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;
 }
 
@@ -111,14 +109,13 @@ int load_cache(struct cache *cache, char *fname)
 	for (group = groups; *group != NULL; group++) {
 		gchar *name;
 		gchar *address;
-		gchar *port;
+		uint16_t port;
 		name = g_key_file_get_value(file, *group, "name", NULL);
 		address = g_key_file_get_value(file, *group, "address", NULL);
-		port = g_key_file_get_value(file, *group, "port", NULL);
+		port = g_key_file_get_integer(file, *group, "port", NULL);
 		cache_add_friend(cache, name, address, port);
 		g_free(name);
 		g_free(address);
-		g_free(port);
 	}
 	g_strfreev(groups);
 	g_key_file_free(file);
@@ -129,14 +126,19 @@ int store_cache(struct cache *cache, char *fname)
 {
 	GKeyFile *file;
 	GList *f;
+	gchar *contents;
+	gssize len;
 	file = g_key_file_new();
 	g_key_file_load_from_file(file, fname, G_KEY_FILE_KEEP_COMMENTS | G_KEY_FILE_KEEP_TRANSLATIONS, NULL);
 	for (f = g_list_first(cache->friends); f != NULL; f = g_list_next(f)) {
 		struct friend *friend = f->data;
 		g_key_file_set_value(file, friend->name, "name", friend->name);
 		g_key_file_set_value(file, friend->name, "address", friend->address);
-		g_key_file_set_value(file, friend->name, "port", friend->port);
+		g_key_file_set_integer(file, friend->name, "port", friend->port);
 	}
+	contents = g_key_file_to_data(file, &len, NULL);
+	g_file_set_contents(fname, contents, len, NULL);
+	g_free(contents);
 	g_key_file_free(file);
 	return 0;
 }