Changeset 767 in ntrip for trunk

Timestamp:

Apr 4, 2008, 3:02:06 PM (17 years ago)

Author:

stuerze

Message:

minor changes regarding a combined proxy + caster response

File:

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

trunk/ntripclient/ntripclient.c

@@ -1 +1 @@
 /*
   Easy example NTRIP client for POSIX.
-  $Id: ntripclient.c,v 1.39 2007/12/14 07:22:29 stoecker Exp $
+  $Id: ntripclient.c,v 1.40 2008/04/04 10:04:39 stoecker Exp $
   Copyright (C) 2003-2005 by Dirk Stoecker <soft@dstoecker.de>
     
@@ -57 +57 @@
 
 /* CVS revision and version */
-static char revisionstr[] = "$Revision: 1.39 $";
-static char datestr[]     = "$Date: 2007/12/14 07:22:29 $";
+static char revisionstr[] = "$Revision: 1.40 $";
+static char datestr[]     = "$Date: 2008/04/04 10:04:39 $";
 
 enum MODE { HTTP = 1, RTSP = 2, NTRIP1 = 3, AUTO = 4, END };
@@ -898 +898 @@
             if(!k)
             {
-              if(numbytes > 17 && (!strncmp(buf, "HTTP/1.1 200 OK\r\n", 17)
-              || !strncmp(buf, "HTTP/1.0 200 OK\r\n", 17)))
+              if( numbytes > 17 && 
+                 !strstr(buf, "ICY 200 OK")  &&  // case 'proxy & ntrip 1.0 caster'
+                 (!strncmp(buf, "HTTP/1.1 200 OK\r\n", 17) || 
+                  !strncmp(buf, "HTTP/1.0 200 OK\r\n", 17)) )
               {
                 const char *datacheck = "Content-Type: gnss/data\r\n";
@@ -925 +927 @@
                   chunkymode = 1;
               }
-              else if(numbytes < 12 || strncmp("ICY 200 OK\r\n", buf, 12))
+              else if(!strstr(buf, "ICY 200 OK"))
               {
                 fprintf(stderr, "Could not get the requested data: ");