Changeset 1847 in ntrip for trunk/ntripclient

Timestamp:

Jun 8, 2009, 4:07:22 PM (15 years ago)

Author:

stoecker

Message:

fixed NMEA sending

File:

• trunk/ntripclient/ntripclient.c (modified) (7 diffs)

trunk/ntripclient/ntripclient.c

@@ -1 +1 @@
 /*
   NTRIP client for POSIX.
-  $Id: ntripclient.c,v 1.48 2009/04/27 09:49:54 stoecker Exp $
+  $Id: ntripclient.c,v 1.49 2009/05/06 14:52:52 stuerze Exp $
   Copyright (C) 2003-2008 by Dirk Stöcker <soft@dstoecker.de>
 
@@ -65 +65 @@
 
 /* CVS revision and version */
-static char revisionstr[] = "$Revision: 1.48 $";
-static char datestr[]     = "$Date: 2009/04/27 09:49:54 $";
+static char revisionstr[] = "$Revision: 1.49 $";
+static char datestr[]     = "$Date: 2009/05/06 14:52:52 $";
 
 enum MODE { HTTP = 1, RTSP = 2, NTRIP1 = 3, AUTO = 4, UDP = 5, END };
@@ -1085 +1085 @@
             "Ntrip-Component: Ntripclient\r\n"
             "User-Agent: %s/%s\r\n"
+            "%s%s%s"
             "Transport: RTP/GNSS;unicast;client_port=%u%s",
             args.server, proxyserver ? ":" : "", proxyserver ? args.port : "",
-            args.data, cseq++, AGENTSTRING, revisionstr, localport,
+            args.data, cseq++, AGENTSTRING, revisionstr,
+            args.nmea ? "Ntrip-GGA: " : "", args.nmea ? args.nmea : "",
+            args.nmea ? "\r\n" : "",
+            localport,
             (*args.user || *args.password) ? "\r\nAuthorization: Basic " : "");
             if(i > MAXDATASIZE-40 || i < 0) /* second check for old glibc */
@@ -1104 +1108 @@
             buf[i++] = '\r';
             buf[i++] = '\n';
-            if(args.nmea)
-            {
-              int j = snprintf(buf+i, MAXDATASIZE-i, "%s\r\n", args.nmea);
-              if(j >= 0 && j < MAXDATASIZE-i)
-                i += j;
-              else
-              {
-                fprintf(stderr, "NMEA string too long\n");
-                stop = 1;
-              }
-            }
           }
           if(!stop && !error)
@@ -1420 +1413 @@
             else
             {
+              const char *nmeahead = (args.nmea && args.mode == HTTP) ? args.nmea : 0;
+
               i=snprintf(buf, MAXDATASIZE-40, /* leave some space for login */
               "GET %s%s%s%s/%s HTTP/1.1\r\n"
               "Host: %s\r\n%s"
               "User-Agent: %s/%s\r\n"
+              "%s%s%s"
               "Connection: close%s"
               , proxyserver ? "http://" : "", proxyserver ? proxyserver : "",
@@ -1430 +1426 @@
               args.mode == NTRIP1 ? "" : "Ntrip-Version: Ntrip/2.0\r\n",
               AGENTSTRING, revisionstr,
+              nmeahead ? "Ntrip-GGA: " : "", nmeahead ? nmeahead : "",
+              nmeahead ? "\r\n" : "",
               (*args.user || *args.password) ? "\r\nAuthorization: Basic " : "");
               if(i > MAXDATASIZE-40 || i < 0) /* second check for old glibc */
@@ -1450 +1448 @@
                   buf[i++] = '\r';
                   buf[i++] = '\n';
-                  if(args.nmea)
+                  if(args.nmea && !nmeahead)
                   {
                     int j = snprintf(buf+i, MAXDATASIZE-i, "%s\r\n", args.nmea);