Changeset 339 in ntrip for trunk/ntripserver

Timestamp:

Nov 29, 2006, 11:43:15 AM (17 years ago)

Author:

stoecker

Message:

fixed illegal zero byte

File:

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

trunk/ntripserver/NtripLinuxServer.c

@@ -41 +41 @@
  */
 
-/* $Id: NtripLinuxServer.c,v 1.23 2006/08/16 08:33:04 stoecker Exp $
+/* $Id: NtripLinuxServer.c,v 1.24 2006/11/23 14:39:50 stoecker Exp $
  * Changes - Version 0.7
  * Sep 22 2003  Steffen Tschirpke <St.Tschirpke@actina.de>
@@ -463 +463 @@
           }
           nBufferBytes += encode(szSendBuffer+nBufferBytes,
-            sizeof(szSendBuffer)-nBufferBytes-5, stream_user, stream_password);
-          if(nBufferBytes > (int)sizeof(szSendBuffer)-5)
+            sizeof(szSendBuffer)-nBufferBytes-4, stream_user, stream_password);
+          if(nBufferBytes > (int)sizeof(szSendBuffer)-4)
           {
             fprintf(stderr, "Username and/or password too long\n");
             exit(1);
           }
-          snprintf(szSendBuffer+nBufferBytes, 5, "\r\n\r\n");
-          nBufferBytes += 5;
+          szSendBuffer[nBufferBytes++] = '\r';
+          szSendBuffer[nBufferBytes++] = '\n';
+          szSendBuffer[nBufferBytes++] = '\r';
+          szSendBuffer[nBufferBytes++] = '\n';
         }
         else
@@ -624 +626 @@
       sizeof(const char *));
     /* send message to caster */
-    szSendBuffer[0] = '\0';
-    sprintf(szSendBuffer, "SOURCE %s /%s\r\n", password, mountpoint);
-    strcat(szSendBuffer, "Source-Agent: ");
-    strcat(szSendBuffer, VERSION);
-    strcat(szSendBuffer, "\r\n");
-    strcat(szSendBuffer, "\r\n");
-    strcat(szSendBuffer, "\0");
-    nBufferBytes = strlen(szSendBuffer);
+    nBufferBytes = sprintf(szSendBuffer, "SOURCE %s /%s\r\nSource-Agent: "
+    VERSION "\r\n\r\n", password, mountpoint);
     if((send(sock_id, szSendBuffer, (size_t)nBufferBytes, 0)) != nBufferBytes)
     {