Changeset 595 in ntrip

Timestamp:

Dec 12, 2007, 10:45:23 AM (17 years ago)

Author:

stoecker

Message:

makefile

Location:

trunk/ntripclient

Files:

• makefile (modified) (1 diff)
• ntripclient.c (modified) (9 diffs)

trunk/ntripclient/makefile

@@ -1 @@
-# $Id: makefile,v 1.3 2007/08/30 07:38:24 stoecker Exp $
+# $Id: makefile,v 1.4 2007/10/05 15:32:13 stuerze Exp $
 # probably works not with all compilers. Thought this should be easy
 # fixable. There is nothing special at this source.
 
+ifdef windir
+OPTS = -Wall -W -O3 -DWINDOWSVERSION -lwsock32
+else
+OPTS = -Wall -W -O3 
+endif
+
 ntripclient: ntripclient.c
-        $(CC) -Wall -W -O3 $? -o $@
-
+        $(CC) $(OPTS) $? -o $@
 
 clean:
-        $(RM) -f ntripclient core*
+        $(RM) ntripclient core*
 
 

trunk/ntripclient/ntripclient.c

@@ -1 +1 @@
 /*
   Easy example NTRIP client for POSIX.
-  $Id: ntripclient.c,v 1.35 2007/10/26 14:56:47 stuerze Exp $
+  $Id: ntripclient.c,v 1.36 2007/11/20 12:54:05 stoecker Exp $
   Copyright (C) 2003-2005 by Dirk Stoecker <soft@dstoecker.de>
     
@@ -57 +57 @@
 
 /* CVS revision and version */
-static char revisionstr[] = "$Revision: 1.35 $";
-static char datestr[]     = "$Date: 2007/10/26 14:56:47 $";
+static char revisionstr[] = "$Revision: 1.36 $";
+static char datestr[]     = "$Date: 2007/11/20 12:54:05 $";
 
 enum MODE { HTTP = 1, RTSP = 2, NTRIP1 = 3, AUTO = 4, END };
@@ -74 +74 @@
   int         bitrate;
   int         mode;
+
+  int         udpport;
+  int         initudp;
 };
 
@@ -83 +86 @@
 static struct option opts[] = {
 { "bitrate",    no_argument,       0, 'b'},
-{ "data",       required_argument, 0, 'd'},
+{ "data",       required_argument, 0, 'd'}, /* compatibility */
 { "mountpoint", required_argument, 0, 'm'},
+{ "initudp",    no_argument,       0, 'I'},
+{ "udpport",    required_argument, 0, 'P'},
 { "server",     required_argument, 0, 's'},
 { "password",   required_argument, 0, 'p'},
@@ -96 +101 @@
 {0,0,0,0}};
 #endif
-#define ARGOPT "-d:m:bhp:r:s:u:n:S:R:M:"
+#define ARGOPT "-d:m:bhp:r:s:u:n:S:R:M:IP:"
 
 int stop = 0;
@@ -293 +298 @@
   args->proxyport = "2101";
   args->mode = AUTO;
+  args->initudp = 0;
+  args->udpport = 0;
   help = 0;
 
@@ -308 +315 @@
     case 'd':
     case 'm':
-       if(optarg && *optarg == '?') 
-         args->data = encodeurl(optarg);
-       else 
-         args->data = optarg; 
-     break;
+      if(optarg && *optarg == '?') 
+        args->data = encodeurl(optarg);
+      else 
+        args->data = optarg; 
+      break;
+    case 'I': args->initudp = 1; break;
+    case 'P': args->udpport = strtol(optarg, 0, 10); break;
     case 'n': args->nmea = optarg; break;
     case 'b': args->bitrate = 1; break;
@@ -552 +561 @@
         /* fill structure with local address information for UDP */
         memset(&local, 0, sizeof(local));
-        local.sin_family = AF_INET;     
-        local.sin_port = htons(0);
+        local.sin_family = AF_INET;
+        local.sin_port = htons(args.udpport);
         local.sin_addr.s_addr = htonl(INADDR_ANY); 
         len = sizeof(local);
@@ -670 +679 @@
                 exit(1);
               }
+            }
+            if(args.initudp)
+            {
+              printf("Sending initial UDP packet\n");
+              struct sockaddr_in casterRTP;
+              char rtpbuffer[12];
+              int i;
+              rtpbuffer[0] = (2<<6);
+              /* padding, extension, csrc are empty */
+              rtpbuffer[1] = 96;
+              /* marker is empty */
+              rtpbuffer[2] = 0;
+              rtpbuffer[3] = 0;
+              rtpbuffer[4] = 0;
+              rtpbuffer[5] = 0;
+              rtpbuffer[6] = 0;
+              rtpbuffer[7] = 0;
+              rtpbuffer[8] = 0;
+              rtpbuffer[9] = 0;
+              rtpbuffer[10] = 0;
+              rtpbuffer[11] = 0;
+              /* fill structure with caster address information for UDP */
+              memset(&casterRTP, 0, sizeof(casterRTP));
+              casterRTP.sin_family = AF_INET;
+              casterRTP.sin_port   = htons(((uint16_t)serverport));
+              casterRTP.sin_addr   = *((struct in_addr *)he->h_addr);
+
+              if((i = sendto(sockudp, rtpbuffer, 12, 0,
+              (struct sockaddr *) &casterRTP, sizeof(casterRTP))) != 12)
+                perror("WARNING: could not send initial UDP packet");
             }