Changeset 550 in ntrip for trunk/ntripclient


Ignore:
Timestamp:
Oct 26, 2007, 4:56:47 PM (13 years ago)
Author:
stuerze
Message:

argument renaming

Location:
trunk/ntripclient
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/ntripclient/README

    r547 r550  
    7272
    7373ntripclient -s server -u user ...
    74  -d --data      the requested data set or criteria for sourcetable filtering
    75  -s --server    the server name or address
    76  -p --password  the login password
    77  -r --port      the server port number (default 2101)
    78  -u --user      the user name
    79  -n --nmea      NMEA string for sending to server
    80  -b --bitrate   output bitrate
    81  -S --proxyhost proxy name or address
    82  -R --proxyport proxy port, optional (default 2101)
    83  -M --mode      mode for data request
     74 -m --mountpoint the requested data set or criteria for sourcetable filtering
     75 -s --server     the server name or address
     76 -p --password   the login password
     77 -r --port       the server port number (default 2101)
     78 -u --user       the user name
     79 -n --nmea       NMEA string for sending to server
     80 -b --bitrate    output bitrate
     81 -S --proxyhost  proxy name or address
     82 -R --proxyport  proxy port, optional (default 2101)
     83 -M --mode       mode for data request
    8484     Valid modes are:
    8585     1, h, http     NTRIP Version 2.0 Caster in TCP/IP mode
     
    8989
    9090or using an URL:
    91 ntripclient ntrip:data[/user[:password]][@[server][:port][@proxyhost[:proxyport]]][;nmea]
     91ntripclient ntrip:mountpoint[/user[:password]][@[server][:port][@proxyhost[:proxyport]]][;nmea]
    9292
    9393The argument '-h' will cause a HELP on the screen.
     
    9797Sourcetable filtering
    9898----------------------
    99 A missing argument '-d' leads to the output of the complete broadcaster
     99A missing argument '-m' leads to the output of the complete broadcaster
    100100sourcetable. This may comprise hundreds of lines in case of large
    101101networks. To limit the output, the sourcetable contents can be filtered
    102 through entering the argument '-d' followed by a sequence of query strings,
     102through entering the argument '-m' followed by a sequence of query strings,
    103103one for each sourcetable data field. Only those sourcetable lines are
    104104returned from the broadcaster whoes data fields match the corresponding
     
    135135
    136136- Searching in a sourcetable for streams in Germany would require
    137   entering the '-d' argument followed by
     137  entering the '-m' argument followed by
    138138  the query string:
    139139  ?STR;;;;;;DEU
    140140
    141141- Searching in a sourcetable for free streams fom the EUREF network and
    142   coming from the Frankfurt area would require entering the '-d' argument
     142  coming from the Frankfurt area would require entering the '-m' argument
    143143  followed by the query string:
    144144  ?STR;;;;;;;EUREF;;=>50&<=51;=>8.1&<8.6;;;;;N
  • trunk/ntripclient/ntripclient.c

    r501 r550  
    11/*
    22  Easy example NTRIP client for POSIX.
    3   $Id: ntripclient.c,v 1.33 2007/10/05 15:40:24 stuerze Exp $
     3  $Id: ntripclient.c,v 1.34 2007/10/08 08:03:19 stoecker Exp $
    44  Copyright (C) 2003-2005 by Dirk Stoecker <soft@dstoecker.de>
    55   
     
    4545
    4646/* CVS revision and version */
    47 static char revisionstr[] = "$Revision: 1.33 $";
    48 static char datestr[]     = "$Date: 2007/10/05 15:40:24 $";
     47static char revisionstr[] = "$Revision: 1.34 $";
     48static char datestr[]     = "$Date: 2007/10/08 08:03:19 $";
    4949
    5050enum MODE { HTTP = 1, RTSP = 2, NTRIP1 = 3, AUTO = 4, END };
     
    7474{ "bitrate",    no_argument,       0, 'b'},
    7575{ "data",       required_argument, 0, 'd'},
     76{ "mountpoint", required_argument, 0, 'm'},
    7677{ "server",     required_argument, 0, 's'},
    7778{ "password",   required_argument, 0, 'p'},
     
    8586{0,0,0,0}};
    8687#endif
    87 #define ARGOPT "-d:bhp:r:s:u:n:S:R:M:"
     88#define ARGOPT "-d:m:bhp:r:s:u:n:S:R:M:"
    8889
    8990#ifdef __GNUC__
     
    294295    case 'p': args->password = optarg; break;
    295296    case 'd':
     297    case 'm':
    296298       if(optarg && *optarg == '?')
    297299         args->data = encodeurl(optarg);
     
    353355  {
    354356    fprintf(stderr, "Version %s (%s) GPL" COMPILEDATE "\nUsage:\n%s -s server -u user ...\n"
    355     " -d " LONG_OPT("--data      ") "the requested data set\n"
    356     " -s " LONG_OPT("--server    ") "the server name or address\n"
    357     " -p " LONG_OPT("--password  ") "the login password\n"
    358     " -r " LONG_OPT("--port      ") "the server port number (default 2101)\n"
    359     " -u " LONG_OPT("--user      ") "the user name\n"
    360     " -n " LONG_OPT("--nmea      ") "NMEA string for sending to server\n"
    361     " -b " LONG_OPT("--bitrate   ") "output bitrate\n"
    362     " -S " LONG_OPT("--proxyhost ") "proxy name or address\n"
    363     " -R " LONG_OPT("--proxyport ") "proxy port, optional (default 2101)\n"
    364     " -M " LONG_OPT("--mode      ") "mode for data request\n"
     357    " -m " LONG_OPT("--mountpoint ") "the requested data set or sourcetable filtering criteria\n"
     358    " -s " LONG_OPT("--server     ") "the server name or address\n"
     359    " -p " LONG_OPT("--password   ") "the login password\n"
     360    " -r " LONG_OPT("--port       ") "the server port number (default 2101)\n"
     361    " -u " LONG_OPT("--user       ") "the user name\n"
     362    " -n " LONG_OPT("--nmea       ") "NMEA string for sending to server\n"
     363    " -b " LONG_OPT("--bitrate    ") "output bitrate\n"
     364    " -S " LONG_OPT("--proxyhost  ") "proxy name or address\n"
     365    " -R " LONG_OPT("--proxyport  ") "proxy port, optional (default 2101)\n"
     366    " -M " LONG_OPT("--mode       ") "mode for data request\n"
    365367    "     Valid modes are:\n"
    366368    "     1, h, http     NTRIP Version 2.0 Caster in TCP/IP mode\n"
     
    368370    "     3, n, ntrip1   NTRIP Version 1.0 Caster\n"
    369371    "     4, a, auto     automatic detection (default)\n"
    370     "or using an URL:\n%s ntrip:data[/user[:password]][@[server][:port][@proxyhost[:proxyport]]][;nmea]\n"
     372    "or using an URL:\n%s ntrip:mountpoint[/user[:password]][@[server][:port][@proxyhost[:proxyport]]][;nmea]\n"
    371373    , revisionstr, datestr, argv[0], argv[0]);
    372374    exit(1);
Note: See TracChangeset for help on using the changeset viewer.