network_stop(): Fixed forgotten removal of a foreign PID file.

[udpgate.git] / src / network.c

diff --git a/src/network.c b/src/network.c
index dfe306e..9bdc058 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -45,9 +45,9 @@
 #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 0x511F02EA       /* paulina.vellum.cz = 81.31.2.234; host order */
-#undef  SERVER_INADDR
 #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 */
@@ -232,25 +232,27 @@ static struct client *client_new(void);
 
 static void handle_master(struct client *master)
 {
+       g_return_if_fail(master!=NULL);
+
+       for (;;) {
+char packet[0x10000];
 ssize_t gotlen;
 struct sockaddr_in sockaddr_in_from;
-char packet[0x10000];
 struct client *client;
 struct sockaddr_in sockaddr_in_server;
 socklen_t sockaddr_in_from_length;
-
-       g_return_if_fail(master!=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 */
 GList *clientl;
 
+               sockaddr_in_from_length=sizeof(sockaddr_in_from);
+               if (-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 */
+                       break;
+
                if (sockaddr_in_from_length!=sizeof(sockaddr_in_from))  /* FIXME: errors reporting */
                        continue;
 
@@ -292,21 +294,23 @@ GList *clientl;
 
 static void handle_probe(struct client *probe)
 {
+       g_return_if_fail(probe!=NULL);
+
+       for (;;) {
 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 */
+               sockaddr_in_from_length=sizeof(sockaddr_in_from);
+               if (-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 */
+                       break;
                if (sockaddr_in_from_length!=sizeof(sockaddr_in_from))  /* FIXME: errors reporting */
                        continue;
 
@@ -316,21 +320,24 @@ socklen_t sockaddr_in_from_length;
 
 static void handle_client(struct client *client)
 {
+       g_return_if_fail(client!=NULL);
+       g_return_if_fail(master!=NULL);
+
+       for (;;) {
 ssize_t gotlen;
 struct sockaddr_in sockaddr_in_from;
 char packet [0x10000];
 socklen_t sockaddr_in_from_length;
 
-       g_return_if_fail(client!=NULL);
-       g_return_if_fail(master!=NULL);
-
-       while (-1!=(gotlen=recvfrom(
-                       client->gpollfd.fd,     /* s */
-                       packet, /* buf */
-                       sizeof(packet), /* len */
-                       0,      /* flags */
-                       (struct sockaddr *)&sockaddr_in_from,   /* from */
-                       &sockaddr_in_from_length))) {   /* fromlen */
+               sockaddr_in_from_length=sizeof(sockaddr_in_from);
+               if (-1==(gotlen=recvfrom(
+                               client->gpollfd.fd,     /* s */
+                               packet, /* buf */
+                               sizeof(packet), /* len */
+                               0,      /* flags */
+                               (struct sockaddr *)&sockaddr_in_from,   /* from */
+                               &sockaddr_in_from_length)))     /* fromlen */
+                       break;
                if (sockaddr_in_from_length!=sizeof(sockaddr_in_from))  /* FIXME: errors reporting */
                        continue;
                client_touch(client);
@@ -451,8 +458,8 @@ int sock;
        if (!sock_gsource_new())
                return FALSE;
 
-       if (-1==(sock=socket(AF_INET,SOCK_DGRAM,0))) {
-               g_warning("socket(AF_INET,SOCK_DGRAM): %m");
+       if (-1==(sock=socket(AF_INET,SOCK_DGRAM,IPPROTO_UDP))) {
+               g_warning("socket(AF_INET,SOCK_DGRAM,IPPROTO_UDP): %m");
                return NULL;
                }
        if (ioctl(sock,FIONBIO,&oneul)) {       /* non-blocking mode */
@@ -617,6 +624,7 @@ int errno_save;
        errno=0;
        kill(daemon_pid,SIGKILL);
        errno_save=errno;
+       write_daemon_running((pid_t)-1);        /* unlink; errors ignored */
        if (errno_save)  {
                g_warning(udpgate_printf_alloca(_("Unable to stop the daemon at PID %d: %s"),
                                (int)daemon_pid,strerror(errno_save)));