Changeset 1811 in ntrip
- Timestamp:
- Apr 27, 2009, 11:49:54 AM (16 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ntripclient/ntripclient.c
r1569 r1811 1 1 /* 2 2 NTRIP client for POSIX. 3 $Id: ntripclient.c,v 1.4 6 2008/11/04 15:35:03 stoecker Exp $3 $Id: ntripclient.c,v 1.47 2009/02/10 12:18:23 stoecker Exp $ 4 4 Copyright (C) 2003-2008 by Dirk Stöcker <soft@dstoecker.de> 5 5 … … 65 65 66 66 /* CVS revision and version */ 67 static char revisionstr[] = "$Revision: 1.4 6$";68 static char datestr[] = "$Date: 200 8/11/04 15:35:03 $";67 static char revisionstr[] = "$Revision: 1.47 $"; 68 static char datestr[] = "$Date: 2009/02/10 12:18:23 $"; 69 69 70 70 enum MODE { HTTP = 1, RTSP = 2, NTRIP1 = 3, AUTO = 4, UDP = 5, END }; … … 706 706 if(args.mode == UDP) 707 707 { 708 int session, tim, seq, init; 708 unsigned int session; 709 int tim, seq, init; 709 710 char rtpbuf[1526]; 710 711 int i=12, j; … … 875 876 { 876 877 time_t ct; 877 int u,v,w; 878 int u,v; 879 unsigned int w; 878 880 u = ((unsigned char)rtpbuf[2]<<8)+(unsigned char)rtpbuf[3]; 879 881 v = ((unsigned char)rtpbuf[4]<<24)+((unsigned char)rtpbuf[5]<<16) … … 1145 1147 "PLAY rtsp://%s%s%s/%s RTSP/1.0\r\n" 1146 1148 "CSeq: %d\r\n" 1147 "Session: % d\r\n"1149 "Session: %u\r\n" 1148 1150 "\r\n", 1149 1151 args.server, proxyserver ? ":" : "", proxyserver ? args.port : "", … … 1239 1241 "GET_PARAMETER rtsp://%s%s%s/%s RTSP/1.0\r\n" 1240 1242 "CSeq: %d\r\n" 1241 "Session: % d\r\n"1243 "Session: %u\r\n" 1242 1244 "\r\n", 1243 1245 args.server, proxyserver ? ":" : "", proxyserver … … 1290 1292 "TEARDOWN rtsp://%s%s%s/%s RTSP/1.0\r\n" 1291 1293 "CSeq: %d\r\n" 1292 "Session: % d\r\n"1294 "Session: %u\r\n" 1293 1295 "\r\n", 1294 1296 args.server, proxyserver ? ":" : "", proxyserver ? args.port : "", -
trunk/ntripserver/ntripserver.c
r1573 r1811 1 1 /* 2 * $Id: ntripserver.c,v 1.4 62009/02/10 12:20:09stoecker Exp $2 * $Id: ntripserver.c,v 1.47 2009/02/11 10:20:32 stoecker Exp $ 3 3 * 4 4 * Copyright (c) 2003...2007 … … 37 37 38 38 /* CVS revision and version */ 39 static char revisionstr[] = "$Revision: 1.4 6$";40 static char datestr[] = "$Date: 2009/02/1 0 12:20:09$";39 static char revisionstr[] = "$Revision: 1.47 $"; 40 static char datestr[] = "$Date: 2009/02/11 10:20:32 $"; 41 41 42 42 #include <ctype.h> … … 136 136 /* Forward references */ 137 137 static void send_receive_loop(sockettype sock, int outmode, 138 struct sockaddr * pcasterRTP, socklen_t length, int rtpssrc); 138 struct sockaddr * pcasterRTP, socklen_t length, unsigned int rtpssrc); 139 139 static void usage(int, char *); 140 140 static int encode(char *buf, int size, const char *user, const char *pwd); … … 220 220 int client_port = 0; 221 221 int server_port = 0; 222 intsession = 0;222 unsigned int session = 0; 223 223 socklen_t len = 0; 224 224 int i = 0; … … 933 933 case UDP: 934 934 { 935 int session; 935 unsigned int session; 936 936 char rtpbuf[1526]; 937 937 int i=12, j; … … 1317 1317 "RECORD rtsp://%s%s/%s RTSP/1.0\r\n" 1318 1318 "CSeq: %d\r\n" 1319 "Session: % d\r\n"1319 "Session: %u\r\n" 1320 1320 "\r\n", 1321 1321 casterouthost, rtsp_extension, mountpoint, udp_cseq++, … … 1374 1374 1375 1375 static void send_receive_loop(sockettype sock, int outmode, struct sockaddr* pcasterRTP, 1376 socklen_t length, int rtpssrc) 1376 socklen_t length, unsigned int rtpssrc) 1377 1377 { 1378 1378 int nodata = 0; … … 1579 1579 i = recv(socket_tcp, rtpbuf, sizeof(rtpbuf), 0); 1580 1580 if(i >= 12 && (unsigned char)rtpbuf[0] == (2 << 6) && rtpssrc == 1581 (((unsigned char)rtpbuf[8]<<24)+((unsigned char)rtpbuf[9]<<16) 1581 (unsigned int)(((unsigned char)rtpbuf[8]<<24)+((unsigned char)rtpbuf[9]<<16) 1582 1582 +((unsigned char)rtpbuf[10]<<8)+(unsigned char)rtpbuf[11])) 1583 1583 { … … 1694 1694 "GET_PARAMETER rtsp://%s%s/%s RTSP/1.0\r\n" 1695 1695 "CSeq: %d\r\n" 1696 "Session: % d\r\n"1696 "Session: %u\r\n" 1697 1697 "\r\n", 1698 1698 casterouthost, rtsp_extension, mountpoint, udp_cseq++, rtpssrc); … … 2282 2282 "TEARDOWN rtsp://%s%s/%s RTSP/1.0\r\n" 2283 2283 "CSeq: %d\r\n" 2284 "Session: % d\r\n"2284 "Session: %u\r\n" 2285 2285 "\r\n", 2286 2286 caster_addr, rtsp_ext, mountpoint, udp_cseq++, session);
Note:
See TracChangeset
for help on using the changeset viewer.