/* $Id$
- * UDP forwarding utility
- * Copyright (C) 2004 Jan Kratochvil <project-udpforward@jankratochvil.net>
+ * UDP Gateway utility network layer
+ * Copyright (C) 2004 Jan Kratochvil <project-udpgate@jankratochvil.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include <string.h>
#include <glib/galloca.h>
#include <glib/gprintf.h>
+#include <glib/grand.h>
#include "network.h"
+#include "packet.h"
+#include "main.h" /* for optarg_verbose */
/* Config: */
-#define NETWORK_PATHNAME_PID "/var/run/udpforward.pid"
+#define NETWORK_PATHNAME_PID "/var/run/udpgate.pid"
#define SOCK_SOURCE_CHECK_EVENTS (G_IO_IN) /* |G_IO_PRI */
#define SOCK_SOURCE_CHECK_REVENTS (SOCK_SOURCE_CHECK_EVENTS) /* |G_IO_ERR|G_IO_HUP|G_IO_NVAL */
-#define SERVER_INADDR 0xEA021F51 /* paulina.vellum.cz = 81.31.2.234 */
-#define SERVER_PORT 9201
+#define SERVER_INADDR 0x7F000001
+#undef SERVER_INADDR
+#define SERVER_INADDR 0x511F02EA /* paulina.vellum.cz = 81.31.2.234; host order */
+#define SERVER_PORT 9201 /* host order */
+#define PROBE_INADDR SERVER_INADDR /* host order */
+#define PROBE_PORT 8201 /* host order */
#define CLIENT_TIMEOUT_SEC (5*60)
+#define PROBE_TIMEOUT_SEC (5)
+
+
+void (*network_notify_hostip)(guint32 hostip_guint32);
struct client {
static GSource *sock_gsource;
-static GList *sock_client_list; /* of 'struct client *' */
-struct client *master;
+static GList *sock_client_list; /* of 'struct client *', incl. 'master' and 'probe' */
+static struct client *master; /* no 'timeout' permitted */
+static struct client *probe; /* 'timeout' permitted */
+static guint32 probe_unique;
static gboolean write_daemon_running(pid_t pid);
if (client->timeout_id) {
gboolean errgboolean;
+ if (optarg_verbose)
+ g_message(_("Client fd %d removed timeout id %d"),client->gpollfd.fd,client->timeout_id);
errgboolean=g_source_remove(client->timeout_id);
g_assert(errgboolean==TRUE);
client->timeout_id=0;
client_timeout_remove(client);
client->timeout_id=g_timeout_add(
- CLIENT_TIMEOUT_SEC*1000, /* interval; msec */
+ (client==probe ? PROBE_TIMEOUT_SEC*1000 : CLIENT_TIMEOUT_SEC*1000), /* interval; msec */
(GSourceFunc)client_touch_timeout, /* function */
client); /* data */
+ if (optarg_verbose)
+ g_message(_("Client fd %d new timeout id %d"),client->gpollfd.fd,client->timeout_id);
g_assert(client->timeout_id!=0);
}
g_return_val_if_fail(client!=NULL,FALSE); /* FALSE=>should be removed */
g_return_val_if_fail(client!=master,FALSE); /* FALSE=>should be removed */
- client_destroy(client);
+ if (optarg_verbose)
+ g_message(_("Client fd %d timeout id %d occured/entered"),client->gpollfd.fd,client->timeout_id);
+
+ /* Do not destroy the timeout in client_destroy().
+ * It would crash GLib - we remove it be returning FALSE from here.
+ */
+ g_assert(client->timeout_id!=0);
+ client->timeout_id=0;
+
+ if (client==probe) {
+ network_stop();
+ /* Never destroy 'client' now - it has been destroyed by network_stop()! */
+ }
+ else {
+ client_destroy(client);
+ }
+
+ if (optarg_verbose)
+ g_message(_("Client timeout occurance finish"));
return FALSE; /* GSource should be removed */
}
+static void handle_master_probe(const void *packet,size_t gotlen,const struct sockaddr_in *sockaddr_in_from)
+{
+GHashTable *got_hash;
+gpointer got_unique_gpointer;
+gpointer hostip_gpointer;
+guint32 hostip_guint32;
+
+ g_return_if_fail(packet!=NULL);
+ g_return_if_fail(sockaddr_in_from!=NULL);
+
+ if (!probe)
+ return;
+
+ if (!(got_hash=packet_disassembly(packet,gotlen)))
+ return;
+ if (!(g_hash_table_lookup_extended(
+ got_hash, /* hash_table */
+ GUINT_TO_POINTER(PACKET_ELEM_TYPE_DATA_GUINT32), /* lookup_key */
+ NULL, /* orig_key */
+ &got_unique_gpointer))) {
+err_packet_disassembly_destroy_got_hash:
+ packet_disassembly_destroy(got_hash);
+ return;
+ }
+ if (GPOINTER_TO_UINT(got_unique_gpointer)!=probe_unique)
+ goto err_packet_disassembly_destroy_got_hash;
+ if (!(g_hash_table_lookup_extended(
+ got_hash, /* hash_table */
+ GUINT_TO_POINTER(PACKET_ELEM_TYPE_CLIENT_INADDR), /* lookup_key */
+ NULL, /* orig_key */
+ &hostip_gpointer)))
+ goto err_packet_disassembly_destroy_got_hash;
+ hostip_guint32=GPOINTER_TO_UINT(hostip_gpointer);
+ packet_disassembly_destroy(got_hash);
+
+ client_destroy(probe);
+ if (network_notify_hostip)
+ (*network_notify_hostip)(hostip_guint32);
+}
+
static struct client *client_new(void);
static void handle_master(struct client *master)
char packet[0x10000];
struct client *client;
struct sockaddr_in sockaddr_in_server;
-socklen_t sockaddr_in_from_len;
+socklen_t sockaddr_in_from_length;
g_return_if_fail(master!=NULL);
- sockaddr_in_from_len=sizeof(sockaddr_in_from);
+ sockaddr_in_from_length=sizeof(sockaddr_in_from);
while (-1!=(gotlen=recvfrom(
master->gpollfd.fd, /* s */
packet, /* buf */
sizeof(packet), /* len */
0, /* flags */
(struct sockaddr *)&sockaddr_in_from, /* from */
- &sockaddr_in_from_len))) { /* fromlen */
+ &sockaddr_in_from_length))) { /* fromlen */
GList *clientl;
- if (sockaddr_in_from_len!=sizeof(sockaddr_in_from)) /* FIXME: errors reporting */
+ if (sockaddr_in_from_length!=sizeof(sockaddr_in_from)) /* FIXME: errors reporting */
+ continue;
+
+ if (packet_recognized(packet,gotlen)) {
+ handle_master_probe(packet,gotlen,&sockaddr_in_from);
continue;
+ }
+
/* FIXME: Performance: Ugly search... */
for (clientl=sock_client_list;clientl;clientl=clientl->next) {
client=clientl->data;
client->sockaddr_in_from=sockaddr_in_from;
}
client_touch(client);
- UDPFORWARD_MEMZERO(&sockaddr_in_server);
+ UDPGATE_MEMZERO(&sockaddr_in_server);
sockaddr_in_server.sin_family=AF_INET;
sockaddr_in_server.sin_port=htons(SERVER_PORT);
sockaddr_in_server.sin_addr.s_addr=htonl(SERVER_INADDR);
}
}
+static void handle_probe(struct client *probe)
+{
+ssize_t gotlen;
+struct sockaddr_in sockaddr_in_from;
+char packet[0x10000];
+socklen_t sockaddr_in_from_length;
+
+ g_return_if_fail(probe!=NULL);
+
+ sockaddr_in_from_length=sizeof(sockaddr_in_from);
+ while (-1!=(gotlen=recvfrom(
+ master->gpollfd.fd, /* s */
+ packet, /* buf */
+ sizeof(packet), /* len */
+ 0, /* flags */
+ (struct sockaddr *)&sockaddr_in_from, /* from */
+ &sockaddr_in_from_length))) { /* fromlen */
+ if (sockaddr_in_from_length!=sizeof(sockaddr_in_from)) /* FIXME: errors reporting */
+ continue;
+
+ /* Probe socket should have no response; maybe some ICMP errors - ignored. */
+ }
+}
+
static void handle_client(struct client *client)
{
ssize_t gotlen;
struct sockaddr_in sockaddr_in_from;
char packet [0x10000];
-socklen_t sockaddr_in_from_len;
+socklen_t sockaddr_in_from_length;
g_return_if_fail(client!=NULL);
g_return_if_fail(master!=NULL);
sizeof(packet), /* len */
0, /* flags */
(struct sockaddr *)&sockaddr_in_from, /* from */
- &sockaddr_in_from_len))) { /* fromlen */
- if (sockaddr_in_from_len!=sizeof(sockaddr_in_from)) /* FIXME: errors reporting */
+ &sockaddr_in_from_length))) { /* fromlen */
+ if (sockaddr_in_from_length!=sizeof(sockaddr_in_from)) /* FIXME: errors reporting */
continue;
client_touch(client);
/* FIXME: errors checking */
struct client *client=clientl->data;
if (client->gpollfd.revents&SOCK_SOURCE_CHECK_REVENTS) {
- if (client==master)
+ /**/ if (client==master)
handle_master(client);
+ else if (client==probe)
+ handle_probe(client);
else
handle_client(client);
}
return NULL;
}
- udpforward_new(client);
+ udpgate_new(client);
client->gpollfd.fd=sock;
client->gpollfd.events=SOCK_SOURCE_CHECK_EVENTS;
client->gpollfd.revents=0;
sock_client_list=g_list_prepend(sock_client_list,client);
g_source_add_poll(sock_gsource,&client->gpollfd);
+ if (optarg_verbose)
+ g_message(_("Client fd %d created"),client->gpollfd.fd);
+
return client;
}
if (!sock_gsource_new())
return;
+ if (optarg_verbose)
+ g_message(_("Client fd %d timeout id %d destroy enter"),client->gpollfd.fd,client->timeout_id);
+
if (client==master) {
master=NULL;
g_assert(client->timeout_id==0);
}
- else
+ else {
+ if (client==probe)
+ probe=NULL;
client_timeout_remove(client);
+ }
g_source_remove_poll(sock_gsource,&client->gpollfd);
sock_client_list=g_list_remove(sock_client_list,client);
close(client->gpollfd.fd); /* errors ignored */
+
+ if (optarg_verbose)
+ g_message(_("Client fd %d timeout id %d destroy finish"),client->gpollfd.fd,client->timeout_id);
+
g_free(client);
}
+static gboolean probe_send(struct client *probe,gint port_local)
+{
+struct sockaddr_in sockaddr_in_server;
+GHashTable *probe_hash;
+gpointer packet;
+size_t packet_length;
+
+ g_return_val_if_fail(probe!=NULL,FALSE);
+
+ probe_unique=g_random_int();
+
+ probe_hash=g_hash_table_new(
+ g_direct_hash, /* hash_func */
+ g_direct_equal); /* key_equal_func */
+ g_hash_table_insert(probe_hash,GUINT_TO_POINTER(PACKET_ELEM_TYPE_CLIENT_PORT) ,GUINT_TO_POINTER(port_local));
+ g_hash_table_insert(probe_hash,GUINT_TO_POINTER(PACKET_ELEM_TYPE_DATA_GUINT32),GUINT_TO_POINTER(probe_unique));
+ packet=packet_assembly(&packet_length,probe_hash);
+ g_hash_table_destroy(probe_hash);
+ if (!packet)
+ return FALSE;
+
+ UDPGATE_MEMZERO(&sockaddr_in_server);
+ sockaddr_in_server.sin_family=AF_INET;
+ sockaddr_in_server.sin_port=htons(PROBE_PORT);
+ sockaddr_in_server.sin_addr.s_addr=htonl(PROBE_INADDR);
+ /* FIXME: errors checking */
+ sendto(
+ probe->gpollfd.fd, /* s */
+ packet, /* msg */
+ packet_length, /* len */
+ 0, /* flags */
+ (struct sockaddr *)&sockaddr_in_server, /* to */
+ sizeof(sockaddr_in_server)); /* tolen */
+
+ return TRUE;
+}
+
gboolean network_start(gint port)
{
pid_t daemon_pid;
g_warning(_("Cannot start network daemon: Daemon is already running on PID %d"),(int)daemon_pid);
return FALSE;
}
+
+ /* Setup 'master': */
g_assert(master==NULL);
if (!(master=client_new()))
return FALSE;
- UDPFORWARD_MEMZERO(&sockaddr_in);
+ UDPGATE_MEMZERO(&sockaddr_in);
sockaddr_in.sin_family=AF_INET;
sockaddr_in.sin_port=htons(port);
- sockaddr_in.sin_addr.s_addr=INADDR_ANY;
+ sockaddr_in.sin_addr.s_addr=htonl(INADDR_ANY);
if (bind(master->gpollfd.fd,(struct sockaddr *)&sockaddr_in,sizeof(sockaddr_in))) {
g_warning("bind(sock,{AF_INET,INADDR_ANY:%d}): %m",(int)port);
+err_sock_gsource_destroy:
sock_gsource_destroy();
return FALSE;
}
+
+ /* Setup 'probe': */
+ if (!(probe=client_new()))
+ goto err_sock_gsource_destroy;
+ probe_send(probe,port);
+ client_touch(probe); /* timeout */
+
write_daemon_running(getpid());
+ if (network_notify_hostip)
+ (*network_notify_hostip)(0);
return TRUE;
}
}
if (daemon_pid==getpid()) {
sock_gsource_destroy();
- return TRUE;
+ goto ok;
}
errno=0;
kill(daemon_pid,SIGKILL);
errno_save=errno;
if (errno_save) {
- g_warning(udpforward_printf_alloca(_("Unable to stop the daemon at PID %d: %s"),
+ g_warning(udpgate_printf_alloca(_("Unable to stop the daemon at PID %d: %s"),
(int)daemon_pid,strerror(errno_save)));
return FALSE;
}
+ok:
+ if (network_notify_hostip)
+ (*network_notify_hostip)(0);
return TRUE;
}
git://git.jankratochvil.net / udpgate.git / blobdiff