X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=friend.c;h=5abd50cc344c1235c21787297ac06e8e4a75786a;hb=5b065b99f7dae9fa2a3841dc0065aa2c5e1af746;hp=2d317e7dcf68c6290de54e2b2307d6cbdf49ccfd;hpb=92d1f23463706939dda3445ddea37028fc03fdb7;p=cascardo%2Ff2fchat.git

diff --git a/friend.c b/friend.c
index 2d317e7..5abd50c 100644
--- a/friend.c
+++ b/friend.c
@@ -26,12 +26,20 @@
 #include <errno.h>
 #include <stdio.h>
 #include "message.h"
+#include "menu.h"
+
+enum {
+	STATE_OFFLINE,
+	STATE_PINGED,
+	STATE_ONLINE,
+};
 
 struct friend {
 	char *name;
 	char *address;
 	uint16_t port;
 	GInetSocketAddress *saddr;
+	int state;
 };
 
 static GSocket *usock;
@@ -40,14 +48,22 @@ int sock_init(void)
 {
 	GSocketAddress *address;
 	GInetAddress *any_addr;
+	GError *error;
+	int err = 0;
 	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);
+	if (!g_socket_bind(usock, address, TRUE, &error)) {
+		err = error->code;
+		g_error_free(error);
+	}
 	g_object_unref(address);
-	message_init(usock);
-	return 0;
+	g_object_unref(any_addr);
+	if (!err)
+		message_init(usock);
+	else
+		g_object_unref(usock);
+	return err;
 }
 
 int friend_send_message(struct friend *friend, char *buffer, size_t len)
@@ -56,18 +72,81 @@ int friend_send_message(struct friend *friend, char *buffer, size_t len)
 	return 0;
 }
 
+void friend_timeout(struct friend *friend)
+{
+	if (friend->state == STATE_PINGED) {
+		friend->state = STATE_OFFLINE;
+	}
+}
+
+void friend_got_message(struct friend *friend, char *buffer, size_t len)
+{
+	if (len >= 4 && !strncmp(buffer, "PING", 4)) {
+		friend->state = STATE_ONLINE;
+		pong(friend);
+	} else if (len >= 4 && !strncmp(buffer, "PONG", 4)) {
+		friend->state = STATE_ONLINE;
+	}
+}
+
+static void friend_list(gchar **args, GSocketAddress *address);
+
+static void friend_add(gchar **args, GSocketAddress *address)
+{
+}
+
+struct menu_item cmds[] = {
+	{ "list", friend_list },
+	{ "add", friend_add },
+};
+
+void friend_cmd(gchar **args, GSocketAddress *address)
+{
+	int i;
+	if (args[1] == NULL)
+		return;
+	for (i = 0; i < sizeof(cmds)/sizeof(cmds[0]); i++) {
+		if (!strcmp(args[1], cmds[i].cmd)) {
+			cmds[i].func(args, address);
+		}
+	}
+}
+
+void friend_init(void)
+{
+	struct menu_item *mi;
+	mi = g_malloc(sizeof(*mi));
+	mi->cmd = "friend";
+	mi->func = friend_cmd;
+	menu_add(mi);
+}
+
 struct cache {
 	GList *friends;
 };
 
 static struct cache *ucache;
 
-struct friend *friend_get_by_address(GInetAddress *address)
+static void friend_list(gchar **args, GSocketAddress *address)
+{
+	char *buffer;
+	GList *l;
+	for (l = g_list_first(ucache->friends); l != NULL; l = g_list_next(l)) {
+		struct friend *friend = l->data;
+		buffer = g_strdup_printf("%s\n", friend->name);
+		g_socket_send_to(usock, address, buffer, strlen(buffer), NULL, NULL);
+		g_free(buffer);
+	}
+	g_socket_send_to(usock, address, buffer, 0, NULL, NULL);
+}
+
+struct friend *friend_get_by_address(GInetAddress *address, uint16_t port)
 {
 	GList *l;
 	for (l = g_list_first(ucache->friends); l != NULL; l = g_list_next(l)) {
 		struct friend *friend = l->data;
-		if (g_inet_address_equal(g_inet_socket_address_get_address(friend->saddr), address))
+		if (g_inet_address_equal(g_inet_socket_address_get_address(friend->saddr), address) &&
+		    friend->port == port)
 			return friend;
 	}
 	return NULL;
@@ -114,6 +193,7 @@ int cache_add_friend(struct cache *cache, char *name, char *address, uint16_t po
 	g_object_unref(addr);
 	cache->friends = g_list_append(cache->friends, friend);
 	ping(friend);
+	friend->state = STATE_PINGED;
 	return 0;
 }