Fixed checking of IPv4 port validity.

[udpgate.git] / src / network.c

diff --git a/src/network.c b/src/network.c
index cf3f4ff..c658c13 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -45,7 +45,7 @@
 #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 */
+#define SERVER_INADDR 0xC37AD054       /* mms2.org = 195.122.208.84; host order */
 #define SERVER_PORT   9201     /* host order */
 #define PROBE_INADDR  SERVER_INADDR    /* host order */
 #define PROBE_PORT    8201     /* host order */
@@ -118,7 +118,12 @@ FILE *f;
                return TRUE;
                }
        if (!(f=fopen(NETWORK_PATHNAME_PID,"w"))) {
-               g_warning(_("Error writing PID %d to \"%s\": %m"),(int)pid,NETWORK_PATHNAME_PID);
+static gboolean once=TRUE;
+
+               if (once) {
+                       once=FALSE;
+                       g_warning(_("Error writing PID %d to \"%s\": %m"),(int)pid,NETWORK_PATHNAME_PID);
+                       }
                return FALSE;
                }
        fprintf(f,"%d\n",(int)pid);     /* errors ignored */
@@ -276,8 +281,12 @@ GList *clientl;
                        continue;
                        }
                /* Not yet initialized by 'probe' reply - drop it. */
-               if (probe)
+               if (probe) {
+                       if (optarg_verbose)
+                               g_message(_("Data packet received from %s but no probe reply yet; dropping packet."),
+                                               SOCKADDR_IN_TO_STRING(&sockaddr_in_from));
                        continue;
+                       }
 
                /* FIXME: Performance: Ugly search... */
                for (clientl=sock_client_list;clientl;clientl=clientl->next) {
@@ -571,19 +580,26 @@ size_t packet_length;
 static gboolean master_start(gint port)
 {
 struct sockaddr_in sockaddr_in;
+uint16_t port_use;
 
        g_return_val_if_fail(port>=0,FALSE);
        g_return_val_if_fail(master==NULL,FALSE);
 
+       port_use=port;
+       if (port < 0 || port_use != port) {
+               g_warning(_("Port value %d is not valid for IPv4!"),(int)port);
+               return FALSE;
+               }
+
        /* Setup 'master': */
        if (!(master=client_new()))
                return FALSE;
        UDPGATE_MEMZERO(&sockaddr_in);
        sockaddr_in.sin_family=AF_INET;
-       sockaddr_in.sin_port=htons(port);
+       sockaddr_in.sin_port=htons(port_use);
        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);
+               g_warning("bind(sock,{AF_INET,INADDR_ANY:%u}): %m",(unsigned)port_use);
                return FALSE;
                }
        return TRUE;