mirror of
https://github.com/servalproject/serval-dna.git
synced 2024-12-19 05:07:56 +00:00
Remove old command-line support
This commit is contained in:
Andrew Bettison
parent
bb5d658779
commit
0dee99dec2
@ -16,7 +16,6 @@ SERVALD_SRC_FILES = \
|
||||
serval-dna/commandline.c \
|
||||
serval-dna/conf.c \
|
||||
serval-dna/dataformats.c \
|
||||
serval-dna/dna.c \
|
||||
serval-dna/log.c \
|
||||
serval-dna/net.c \
|
||||
serval-dna/mkdir.c \
|
||||
|
||||
@ -4,7 +4,6 @@ SRCS= main.c \
|
||||
client.c \
|
||||
commandline.c \
|
||||
dataformats.c \
|
||||
dna.c \
|
||||
conf.c \
|
||||
log.c \
|
||||
net.c \
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
dnl Process this file with autoconf to produce a configure script.
|
||||
AC_INIT(dna.c)
|
||||
AC_INIT(servald, 0.9)
|
||||
|
||||
CPPFLAGS=-D_GNU_SOURCE
|
||||
|
||||
|
||||
240
dna.c
240
dna.c
@ -1,240 +0,0 @@
|
||||
/*
|
||||
Serval Distributed Numbering Architecture (DNA)
|
||||
Copyright (C) 2010 Paul Gardner-Stephen
|
||||
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License
|
||||
as published by the Free Software Foundation; either version 2
|
||||
of the License, or (at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#include "serval.h"
|
||||
#include "rhizome.h"
|
||||
#include <unistd.h>
|
||||
|
||||
int usage(char *complaint)
|
||||
{
|
||||
fprintf(stderr,"dna: %s\n",complaint);
|
||||
fprintf(stderr,"usage:\n");
|
||||
fprintf(stderr," dna [-v <flags>] -S [-f keyring file] [-N interface,...] [-G gateway specification] [-r rhizome path]\n");
|
||||
fprintf(stderr,"or\n");
|
||||
fprintf(stderr," dna [-v <flags>] [-t timeout] -d did -C\n");
|
||||
fprintf(stderr,"or\n");
|
||||
fprintf(stderr," dna [-v <flags>] -f <keyring file> -E <export.txt>\n");
|
||||
|
||||
fprintf(stderr,"\n");
|
||||
fprintf(stderr," -v - Set verbosity.\n");
|
||||
fprintf(stderr," -b - Specify BATMAN socket to obtain peer list (flaky).\n");
|
||||
fprintf(stderr," -l - Specify BATMAN socket to obtain peer list (better, but requires Serval patched BATMAN).\n");
|
||||
fprintf(stderr," -L - Log mesh statistics to specified file.\n");
|
||||
fprintf(stderr," -m - Return multiple variable values instead of only first response.\n");
|
||||
fprintf(stderr," -M - Create and import a new bundle from the specified manifest.\n");
|
||||
fprintf(stderr," -n - Do not detach from foreground in server mode.\n");
|
||||
fprintf(stderr," -S - Run in server mode.\n");
|
||||
fprintf(stderr," -f - Location of keyring file.\n");
|
||||
fprintf(stderr," -p - Specify additional DNA nodes to query.\n");
|
||||
fprintf(stderr," -P - Authenticate using the supplied pin.\n");
|
||||
fprintf(stderr," -r - Enable Rhizome store-and-forward transport using the specified data store directory.\n");
|
||||
fprintf(stderr," To limit the storage: echo space=[KB] > path/rhizome.conf\n");
|
||||
fprintf(stderr," -O - Place read variable value into files using argument as a template.\n");
|
||||
fprintf(stderr," The following template codes can be used (interpretted by sprintf):\n");
|
||||
fprintf(stderr," %%1$s - Subscriber ID\n");
|
||||
fprintf(stderr," %%2$d - Variable ID (0-255)\n");
|
||||
fprintf(stderr," %%3$d - Variable instance number (0-255)\n");
|
||||
fprintf(stderr," -C - Request the creation of a new subscriber with the specified DID.\n");
|
||||
fprintf(stderr," -t - Specify the request timeout period.\n");
|
||||
fprintf(stderr," -G - Offer gateway services. Argument specifies locations of necessary files.\n");
|
||||
fprintf(stderr," Use -G [potato|android|custom:...] to set defaults for your device type.\n");
|
||||
fprintf(stderr," -N - Specify one or more interfaces for the DNA overlay mesh to operate.\n");
|
||||
fprintf(stderr," Interface specifications take the form <+|->[interface[=type][,...]\n");
|
||||
fprintf(stderr," e.g., -N -en0,+ to use all interfaces except en0\n");
|
||||
fprintf(stderr,"\n");
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
int parseOldCommandLine(int argc, char **argv)
|
||||
{
|
||||
int c;
|
||||
//char *pin=NULL;
|
||||
char *keyring_file=NULL;
|
||||
int instance=-1;
|
||||
int foregroundMode=0;
|
||||
int clientMode=0;
|
||||
const char *rhizome_path = NULL;
|
||||
WARNF("The use of the old command line structure is being deprecated.");
|
||||
WARNF("Type '%s help' to learn about the new command line structure.", argv[0]);
|
||||
while ((c = getopt(argc,argv,"b:B:E:G:I:Sf:i:l:L:mnp:P:r:t:v:CO:N:")) != -1) {
|
||||
switch(c)
|
||||
{
|
||||
case 'S': serverMode=1; break;
|
||||
case 'r': /* Enable rhizome */
|
||||
if (rhizome_path) return WHY("-r specified more than once");
|
||||
rhizome_path = optarg;
|
||||
break;
|
||||
case 'm': returnMultiVars=1; break;
|
||||
case 'N': /* Ask for overlay network to setup one or more interfaces */
|
||||
if (overlay_interface_args(optarg))
|
||||
return WHY("Invalid interface specification(s) passed to -N");
|
||||
overlayMode=1;
|
||||
break;
|
||||
case 'G': /* Offer gateway services */
|
||||
gatewayspec=strdup(optarg);
|
||||
if(prepareGateway(gatewayspec)) return usage("Invalid gateway specification");
|
||||
break;
|
||||
case 'n': /* don't detach from foreground in server mode */
|
||||
foregroundMode=1; break;
|
||||
case 'b': /* talk peers on a BATMAN mesh */
|
||||
batman_socket=strdup(optarg);
|
||||
break;
|
||||
case 'l': /* talk peers on a BATMAN mesh */
|
||||
batman_peerfile=strdup(optarg);
|
||||
break;
|
||||
case 'L':
|
||||
instrumentation_file=strdup(optarg);
|
||||
break;
|
||||
case 'B': /* Set simulated Bit Error Rate for bench-testing */
|
||||
simulatedBER=atof(optarg);
|
||||
fprintf(stderr,"WARNING: Bit error injection enabled -- this will cause packet loss and is intended only for testing.\n");
|
||||
break;
|
||||
case 'i':
|
||||
instance=atoi(optarg);
|
||||
if (instance<-1||instance>255) usage("Illegal variable instance ID.");
|
||||
break;
|
||||
case 'f':
|
||||
if (clientMode) usage("Only servers use keyring files");
|
||||
keyring_file=strdup(optarg);
|
||||
break;
|
||||
case 'p': /* additional peers to query */
|
||||
if (additionalPeer(optarg)) exit(-3);
|
||||
break;
|
||||
case 'P': /* Supply pin */
|
||||
//pin=strdup(optarg);
|
||||
clientMode=1;
|
||||
break;
|
||||
case 't': /* request timeout (ms) */
|
||||
dnatimeout=atoi(optarg);
|
||||
break;
|
||||
case 'v': /* set verbosity */
|
||||
debug |= debugFlagMask(optarg);
|
||||
break;
|
||||
case 'C': /* create a new keyring entry */
|
||||
return WHY("Entries in new keyring format must be used with new command line framework.");
|
||||
break;
|
||||
case 'O': /* output to templated files */
|
||||
if (outputtemplate) usage("You can only specify -O once");
|
||||
outputtemplate=strdup(optarg);
|
||||
break;
|
||||
default:
|
||||
usage("Invalid option");
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (optind<argc) usage("Extraneous options at end of command");
|
||||
|
||||
if (keyring_file&&clientMode) usage("Only servers use backing files");
|
||||
if (serverMode&&clientMode) usage("You asked me to be both server and client. That's silly.");
|
||||
if (rhizome_path) {
|
||||
rhizome_set_datastore_path(rhizome_path);
|
||||
if (rhizome_opendb() == -1)
|
||||
exit(-1);
|
||||
}
|
||||
if (serverMode) {
|
||||
if (!keyring_file) {
|
||||
/* Set keyring file to be in the Rhizome directory, to save the need to specify it separately. */
|
||||
char temp[1024];
|
||||
if (!FORM_RHIZOME_DATASTORE_PATH(temp, "serval.keyring"))
|
||||
exit(-1);
|
||||
keyring_file = strdup(temp);
|
||||
}
|
||||
if (!foregroundMode)
|
||||
daemon(0,0);
|
||||
return server(keyring_file);
|
||||
}
|
||||
if (!clientMode) usage("Serval server and client utility.");
|
||||
|
||||
/* Client mode: */
|
||||
return 0;
|
||||
}
|
||||
|
||||
int parseAssignment(unsigned char *text,int *var_id,unsigned char *value,int *value_len)
|
||||
{
|
||||
/* Parse an assignment.
|
||||
|
||||
Valid formats are:
|
||||
|
||||
var=@file - value comes from named file.
|
||||
var=[[$]value] - value comes from string, and may be empty. $ means value is in hex
|
||||
|
||||
Values are length limited to 65535 bytes.
|
||||
*/
|
||||
|
||||
int i;
|
||||
int max_len=*value_len;
|
||||
int vlen=0;
|
||||
int tlen=strlen((char *)text);
|
||||
|
||||
if (tlen>3072) {
|
||||
return WHY("Variable assignment string is too long, use =@file to read value from a file");
|
||||
}
|
||||
|
||||
/* Identify which variable */
|
||||
*var_id=-1;
|
||||
for(i=0;i<tlen;i++) if (text[i]=='=') break;
|
||||
|
||||
/* Go through known keyring variables */
|
||||
if (!strcasecmp((char *)text,"did")) *var_id=KEYTYPE_DID;
|
||||
|
||||
if (*var_id==-1) return WHY("Illegal variable name in assignment");
|
||||
|
||||
i++;
|
||||
switch(text[i])
|
||||
{
|
||||
case '$': /* hex */
|
||||
i++;
|
||||
while(i<tlen) {
|
||||
int b=hexvalue(text[i++])<<4;
|
||||
if (i>=tlen) return WHY("Variable value has an odd number of hex digits.");
|
||||
b|=hexvalue(text[i++]);
|
||||
if (b<0) return WHY("That doesn't look like hex to me");
|
||||
if (vlen>=max_len) return WHY("Variable hex value too long");
|
||||
value[vlen++]=b;
|
||||
}
|
||||
*value_len=vlen;
|
||||
return 0;
|
||||
break;
|
||||
case '@': /* file */
|
||||
{
|
||||
FILE *f=fopen((char *)&text[i+1],"r");
|
||||
int flen;
|
||||
fseek(f,0,SEEK_END);
|
||||
flen=ftell(f);
|
||||
if (flen>max_len) return WHY("Variable value from file too long");
|
||||
fseek(f,0,SEEK_SET);
|
||||
vlen=fread(value,1,flen,f);
|
||||
if (vlen!=flen) return WHY("Could not read all of file");
|
||||
fclose(f);
|
||||
*value_len=vlen;
|
||||
return 0;
|
||||
}
|
||||
break;
|
||||
default: /* literal string */
|
||||
vlen=strlen((char *)&text[i]);
|
||||
if (vlen>max_len) return WHY("Variable value too long");
|
||||
bcopy(&text[i],value,vlen);
|
||||
*value_len=vlen;
|
||||
return 0;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
7
main.c
7
main.c
@ -32,12 +32,7 @@ int main(int argc, char **argv)
|
||||
memabuseInit();
|
||||
srandomdev();
|
||||
server_save_argv(argc, (const char*const*)argv);
|
||||
int status = 0;
|
||||
/* If first argument starts with a dash, assume it is for the old command line parser. */
|
||||
if (argc > 1 && argv[1][0] == '-')
|
||||
status = parseOldCommandLine(argc, argv);
|
||||
else
|
||||
status = parseCommandLine(argv[0], argc - 1, (const char*const*)&argv[1]);
|
||||
int status = parseCommandLine(argv[0], argc - 1, (const char*const*)&argv[1]);
|
||||
#if defined WIN32
|
||||
WSACleanup();
|
||||
#endif
|
||||
|
||||
3
serval.h
3
serval.h
@ -1191,9 +1191,6 @@ typedef struct dna_identity_status {
|
||||
|
||||
int parseCommandLine(const char *argv0, int argc, const char *const *argv);
|
||||
|
||||
int parseOldCommandLine(int argc, char **argv);
|
||||
int parseAssignment(unsigned char *text, int *var_id, unsigned char *value, int *value_len);
|
||||
|
||||
dna_identity_status *dnacache_lookup(char *did,char *name,char *sid);
|
||||
dna_identity_status *dnacache_lookup_next();
|
||||
int dnacache_update_verification(char *did,char *sid,char *name,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user