Changeset 768 in ntrip for trunk/ntripserver/ntripserver.c

Timestamp:

Apr 4, 2008, 3:07:31 PM (16 years ago)

Author:

stuerze

Message:

minor changes regarding a combined proxy + caster response

File:

• trunk/ntripserver/ntripserver.c (modified) (6 diffs)

trunk/ntripserver/ntripserver.c

@@ -1 +1 @@
 /*
- * $Id: ntripserver.c,v 1.38 2008/01/08 11:20:01 stuerze Exp $
+ * $Id: ntripserver.c,v 1.39 2008/04/04 10:03:11 stoecker Exp $
  *
  * Copyright (c) 2003...2007
@@ -37 +37 @@
 
 /* CVS revision and version */
-static char revisionstr[] = "$Revision: 1.38 $";
-static char datestr[]     = "$Date: 2008/01/08 11:20:01 $";
+static char revisionstr[] = "$Revision: 1.39 $";
+static char datestr[]     = "$Date: 2008/04/04 10:03:11 $";
 
 #include <ctype.h>
@@ -686 +686 @@
             if(strstr(szSendBuffer, "\r\n"))
             {              
-              if(strncmp(szSendBuffer, "ICY 200 OK", 10))
+              if(!strstr(szSendBuffer, "ICY 200 OK"))
               {
                 int k;
@@ -698 +698 @@
                 }
                 fprintf(stderr, "\n");
-                if(strncmp(szSendBuffer, "SOURCETABLE 200 OK",18))
+                if(!strstr(szSendBuffer, "SOURCETABLE 200 OK"))
                 {
                   reconnect_sec_max =0;
@@ -1265 +1265 @@
 #endif
       }
-      else 
+      else
+#ifdef WINDOWSVERSION
         nBufferBytes = recv(gps_socket, buffer, sizeof(buffer), 0);
+#else
+        nBufferBytes = read(gps_socket, buffer, sizeof(buffer));
+#endif
       if(!nBufferBytes)
       {
@@ -1385 +1389 @@
       last.tv_sec  = now.tv_sec;
       last.tv_usec = now.tv_usec;
-
       if ((i = sendto(sock, rtpbuffer, 12 + nBufferBytes, 0, pcasterRTP,
       length)) != (nBufferBytes + 12))