Changeset 550 in ntrip

Timestamp:

Oct 26, 2007, 4:56:47 PM (16 years ago)

Author:

stuerze

Message:

argument renaming

Location:

trunk/ntripclient

Files:

• README (modified) (4 diffs)
• ntripclient.c (modified) (7 diffs)

trunk/ntripclient/README

@@ -72 +72 @@
 
 ntripclient -s server -u user ...
- -d --data      the requested data set or criteria for sourcetable filtering
- -s --server    the server name or address
- -p --password  the login password
- -r --port      the server port number (default 2101)
- -u --user      the user name
- -n --nmea      NMEA string for sending to server
- -b --bitrate   output bitrate
- -S --proxyhost proxy name or address
- -R --proxyport proxy port, optional (default 2101)
- -M --mode      mode for data request
+ -m --mountpoint the requested data set or criteria for sourcetable filtering
+ -s --server     the server name or address
+ -p --password   the login password
+ -r --port       the server port number (default 2101)
+ -u --user       the user name
+ -n --nmea       NMEA string for sending to server
+ -b --bitrate    output bitrate
+ -S --proxyhost  proxy name or address
+ -R --proxyport  proxy port, optional (default 2101)
+ -M --mode       mode for data request
      Valid modes are:
      1, h, http     NTRIP Version 2.0 Caster in TCP/IP mode
@@ -89 +89 @@
 
 or using an URL:
-ntripclient ntrip:data[/user[:password]][@[server][:port][@proxyhost[:proxyport]]][;nmea]
+ntripclient ntrip:mountpoint[/user[:password]][@[server][:port][@proxyhost[:proxyport]]][;nmea]
 
 The argument '-h' will cause a HELP on the screen.
@@ -97 +97 @@
 Sourcetable filtering
 ----------------------
-A missing argument '-d' leads to the output of the complete broadcaster
+A missing argument '-m' leads to the output of the complete broadcaster
 sourcetable. This may comprise hundreds of lines in case of large 
 networks. To limit the output, the sourcetable contents can be filtered 
-through entering the argument '-d' followed by a sequence of query strings,
+through entering the argument '-m' followed by a sequence of query strings,
 one for each sourcetable data field. Only those sourcetable lines are
 returned from the broadcaster whoes data fields match the corresponding
@@ -135 +135 @@
 
 - Searching in a sourcetable for streams in Germany would require
-  entering the '-d' argument followed by
+  entering the '-m' argument followed by
   the query string:
   ?STR;;;;;;DEU
 
 - Searching in a sourcetable for free streams fom the EUREF network and
-  coming from the Frankfurt area would require entering the '-d' argument
+  coming from the Frankfurt area would require entering the '-m' argument
   followed by the query string:
   ?STR;;;;;;;EUREF;;=>50&<=51;=>8.1&<8.6;;;;;N

trunk/ntripclient/ntripclient.c

@@ -1 +1 @@
 /*
   Easy example NTRIP client for POSIX.
-  $Id: ntripclient.c,v 1.33 2007/10/05 15:40:24 stuerze Exp $
+  $Id: ntripclient.c,v 1.34 2007/10/08 08:03:19 stoecker Exp $
   Copyright (C) 2003-2005 by Dirk Stoecker <soft@dstoecker.de>
     
@@ -45 +45 @@
 
 /* CVS revision and version */
-static char revisionstr[] = "$Revision: 1.33 $";
-static char datestr[]     = "$Date: 2007/10/05 15:40:24 $";
+static char revisionstr[] = "$Revision: 1.34 $";
+static char datestr[]     = "$Date: 2007/10/08 08:03:19 $";
 
 enum MODE { HTTP = 1, RTSP = 2, NTRIP1 = 3, AUTO = 4, END };
@@ -74 +74 @@
 { "bitrate",    no_argument,       0, 'b'},
 { "data",       required_argument, 0, 'd'},
+{ "mountpoint", required_argument, 0, 'm'},
 { "server",     required_argument, 0, 's'},
 { "password",   required_argument, 0, 'p'},
@@ -85 +86 @@
 {0,0,0,0}};
 #endif
-#define ARGOPT "-d:bhp:r:s:u:n:S:R:M:"
+#define ARGOPT "-d:m:bhp:r:s:u:n:S:R:M:"
 
 #ifdef __GNUC__
@@ -294 +295 @@
     case 'p': args->password = optarg; break;
     case 'd':
+    case 'm':
        if(optarg && *optarg == '?') 
          args->data = encodeurl(optarg);
@@ -353 +355 @@
   {
     fprintf(stderr, "Version %s (%s) GPL" COMPILEDATE "\nUsage:\n%s -s server -u user ...\n"
-    " -d " LONG_OPT("--data      ") "the requested data set\n"
-    " -s " LONG_OPT("--server    ") "the server name or address\n"
-    " -p " LONG_OPT("--password  ") "the login password\n"
-    " -r " LONG_OPT("--port      ") "the server port number (default 2101)\n"
-    " -u " LONG_OPT("--user      ") "the user name\n"
-    " -n " LONG_OPT("--nmea      ") "NMEA string for sending to server\n"
-    " -b " LONG_OPT("--bitrate   ") "output bitrate\n"
-    " -S " LONG_OPT("--proxyhost ") "proxy name or address\n"
-    " -R " LONG_OPT("--proxyport ") "proxy port, optional (default 2101)\n"
-    " -M " LONG_OPT("--mode      ") "mode for data request\n"
+    " -m " LONG_OPT("--mountpoint ") "the requested data set or sourcetable filtering criteria\n"
+    " -s " LONG_OPT("--server     ") "the server name or address\n"
+    " -p " LONG_OPT("--password   ") "the login password\n"
+    " -r " LONG_OPT("--port       ") "the server port number (default 2101)\n"
+    " -u " LONG_OPT("--user       ") "the user name\n"
+    " -n " LONG_OPT("--nmea       ") "NMEA string for sending to server\n"
+    " -b " LONG_OPT("--bitrate    ") "output bitrate\n"
+    " -S " LONG_OPT("--proxyhost  ") "proxy name or address\n"
+    " -R " LONG_OPT("--proxyport  ") "proxy port, optional (default 2101)\n"
+    " -M " LONG_OPT("--mode       ") "mode for data request\n"
     "     Valid modes are:\n"
     "     1, h, http     NTRIP Version 2.0 Caster in TCP/IP mode\n"
@@ -368 +370 @@
     "     3, n, ntrip1   NTRIP Version 1.0 Caster\n"
     "     4, a, auto     automatic detection (default)\n"
-    "or using an URL:\n%s ntrip:data[/user[:password]][@[server][:port][@proxyhost[:proxyport]]][;nmea]\n"
+    "or using an URL:\n%s ntrip:mountpoint[/user[:password]][@[server][:port][@proxyhost[:proxyport]]][;nmea]\n"
     , revisionstr, datestr, argv[0], argv[0]);
     exit(1);