Changeset 765 in ntrip for trunk

Timestamp:

Apr 4, 2008, 12:03:11 PM (17 years ago)

Author:

stoecker

Message:

NTRIP2 fixes

File:

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

trunk/ntripserver/ntripserver.c

@@ -1 +1 @@
 /*
- * $Id: ntripserver.c,v 1.37 2008/01/04 15:23:06 stuerze Exp $
+ * $Id: ntripserver.c,v 1.38 2008/01/08 11:20:01 stuerze Exp $
  *
  * Copyright (c) 2003...2007
@@ -37 +37 @@
 
 /* CVS revision and version */
-static char revisionstr[] = "$Revision: 1.37 $";
-static char datestr[]     = "$Date: 2008/01/04 15:23:06 $";
+static char revisionstr[] = "$Revision: 1.38 $";
+static char datestr[]     = "$Date: 2008/01/08 11:20:01 $";
 
 #include <ctype.h>
@@ -132 +132 @@
 /* Forward references */
 static void send_receive_loop(sockettype sock, int outmode,
-  struct sockaddr * pcasterRTP, socklen_t length);
+  struct sockaddr * pcasterRTP, socklen_t length, int rtpssrc);
 static void usage(int, char *);
 static int  encode(char *buf, int size, const char *user, const char *pwd);
@@ -442 +442 @@
       " BETA AND MAY BE CHANGED ***\n\n");
   }
-  
+
   if(*ntrip_str && (outputmode == NTRIP1))
   {
@@ -924 +924 @@
           }
 #endif
-          send_receive_loop(socket_tcp, outputmode, NULL, 0);
+          send_receive_loop(socket_tcp, outputmode, NULL, 0, 0);
           input_init = output_init = 0;
           break;
@@ -993 +993 @@
           }
 #endif
-          send_receive_loop(socket_tcp, outputmode, NULL, 0);
+          send_receive_loop(socket_tcp, outputmode, NULL, 0, 0);
           input_init = output_init = 0;
           break;
@@ -1121 +1121 @@
               server_port = atoi(tok_buf[10]);
               nBufferBytes = snprintf(szSendBuffer, sizeof(szSendBuffer),
-                "POST rtsp://%s%s/%s RTSP/1.0\r\n"
+                "RECORD rtsp://%s%s/%s RTSP/1.0\r\n"
                 "CSeq: 2\r\n"
                 "Session: %d\r\n"
@@ -1162 +1162 @@
               len = (socklen_t)sizeof(casterRTP);
               send_receive_loop(socket_udp, outputmode, (struct sockaddr *)&casterRTP, 
-              (socklen_t)len);
+              (socklen_t)len, session);
               break;
             }
@@ -1169 +1169 @@
           input_init = output_init = 0;
           break;
-      }     
+      }
     }
     close_session(casterouthost, mountpoint, cseq, session, rtsp_extension, 0);
@@ -1180 +1180 @@
 
 static void send_receive_loop(sockettype sock, int outmode, struct sockaddr* pcasterRTP,
-socklen_t length)
+socklen_t length, int rtpssrc)
 {
   int      nodata = 0;
@@ -1194 +1194 @@
   long int sendtimediff;
   int      rtpseq = 0;
-  int      rtpssrc = 0;
   int      rtptime = 0;
 
@@ -1359 +1358 @@
         rtpseq = rand();
         rtptime = rand();
-        rtpssrc = rand();
         last = now;
         isfirstpacket = 0;