Changeset 24 in ntrip for trunk/ntripserver

Timestamp:

Jun 7, 2005, 4:47:52 PM (19 years ago)

Author:

stoecker

Message:

some UDP fixes

File:

• trunk/ntripserver/NtripLinuxServer.c (modified) (10 diffs)

trunk/ntripserver/NtripLinuxServer.c

@@ -41 +41 @@
  */
 
-/* $Id: NtripLinuxServer.c,v 1.11 2005/04/27 10:31:12 stoecker Exp $
+/* $Id: NtripLinuxServer.c,v 1.12 2005/06/02 09:33:11 stoecker Exp $
  * Changes - Version 0.7
  * Sep 22 2003  Steffen Tschirpke <St.Tschirpke@actina.de>
@@ -59 +59 @@
  *           - TCP sending now somewhat more stable
  *           - cleanup of error handling
+ *           - Modes may be symbolic and not only numeric
  *
  * Changes - Version 0.11
@@ -66 +67 @@
  *           - cleanup of host and port handling
  *           - added inactivity alarm of 60 seconds
+ *
+ * Changes - Version 0.12
+ * Jun 07 2005  Dirk Stoecker <soft@dstoecker.de>
+ *           - added UDP bindmode
  */
 
@@ -93 +98 @@
 enum MODE { SERIAL = 1, TCPSOCKET = 2, INFILE = 3, SISNET = 4, UDPSOCKET = 5 };
 
-#define VERSION         "NTRIP NtripServerLinux/0.11"
+#define VERSION         "NTRIP NtripServerLinux/0.12"
 #define BUFSZ           1024
 
@@ -160 +165 @@
   const char *sisnetuser = "";
   const char *initfile = NULL;
+  int bindmode = 0;
   int sock_id;
   char szSendBuffer[BUFSZ];
@@ -174 +180 @@
     exit(1);
   }
-  while((c = getopt(argc, argv, "M:i:h:b:p:s:a:m:c:H:P:f:l:u:V:")) != EOF)
+  while((c = getopt(argc, argv, "M:i:h:b:p:s:a:m:c:H:P:f:l:u:V:B")) != EOF)
   {
     switch (c)
@@ -194 +200 @@
       ttyport = optarg;
       break;
+    case 'B':
+      bindmode = 1;
+      break;
     case 'V':
       if(!strcmp("3.0", optarg)) sisnetv3 = 1;
@@ -339 +348 @@
 
       memset((char *) &addr, 0x00, sizeof(addr));
-      memcpy(&addr.sin_addr, he->h_addr, (size_t)he->h_length);
+      if(!bindmode)
+        memcpy(&addr.sin_addr, he->h_addr, (size_t)he->h_length);
       addr.sin_family = AF_INET;
       addr.sin_port = htons(inport);
 
-      printf("%s input: host = %s, port = %d%s%s\n", mode == SISNET ? "sisnet"
-        : "socket",
-        inet_ntoa(addr.sin_addr), inport, initfile ? ", initfile = " : "",
-        initfile ? initfile : "");
-
-      if(connect(gpsfd, (struct sockaddr *) &addr, sizeof(addr)) < 0)
+      printf("%s input: host = %s, port = %d%s%s%s\n", mode == SISNET ? "sisnet"
+        : mode == TCPSOCKET ? "tcp socket" : "udp socket",
+        bindmode ? "127.0.0.1" : inet_ntoa(addr.sin_addr), inport,
+        initfile ? ", initfile = " : "",
+        initfile ? initfile : "", bindmode ? " binding mode" : "");
+
+      if(bindmode)
+      {
+        if(bind(gpsfd, (struct sockaddr *) &addr, sizeof(addr)) < 0)
+        {
+          fprintf(stderr, "ERROR: can't bind input to port %d\n", inport);
+          exit(1);
+        }
+      }
+      else if(connect(gpsfd, (struct sockaddr *) &addr, sizeof(addr)) < 0)
       {
         fprintf(stderr, "ERROR: can't connect input to %s at port %d\n",
@@ -484 +503 @@
       exit(0);
     }
-    printf("connection succesfull\n");
+    printf("connection successfull\n");
     send_receive_loop(sock_id, gpsfd, mode == SISNET);
   }
@@ -723 +742 @@
   fprintf(stderr, "    -H hostname of TCP server (default: %s)\n", SERV_HOST_ADDR);
   fprintf(stderr, "    -f initfile send to server\n");
+  fprintf(stderr, "    -B bindmode (bind to incoming UDP stream)\n");
   fprintf(stderr, "  Mode = sisnet:\n");
   fprintf(stderr, "    -P receiver port (default: %d)\n", SISNET_PORT);