ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-04-07 11:08:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor main() into main.c

Browse Source 
Now dna.c only contains code for the old command line
This commit is contained in:
Andrew Bettison 2012-05-15 11:09:21 +09:30
parent cecb09f46a
commit 7087afc404
8 changed files with 154 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Android.mk
View File

@ -29,7 +29,8 @@ SQLITE3_INC=$(LOCAL_PATH)/sqlite3
include $(LOCAL_PATH)/serval-dna/nacl/$(NACL_VER)/build_android/sources.mk
LOCAL_SRC_FILES:= \
serval-dna/overlay_abbreviations.c \
serval-dna/main.c \
serval-dna/overlay_abbreviations.c \
serval-dna/overlay_advertise.c \
serval-dna/overlay_buffer.c \
serval-dna/overlay_interface.c \

3
Makefile.in
View File

@ -1,4 +1,5 @@
SRCS= batman.c \
SRCS= main.c \
batman.c \
ciphers.c \
client.c \
commandline.c \

3
client.c
View File

@ -20,6 +20,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "serval.h"
int sock = -1;
char *outputtemplate = NULL;
int returnMultiVars = 0;
int timeout = 3000; /* default 3000 ms request timeout */
/* Now that we are using the keyring, we only support a small subset of variables.
(VAR_NAME is not properly supported yet)

214
dna.c
View File

@ -19,89 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "serval.h"
#include "rhizome.h"
#include <signal.h>
#include <unistd.h>
char *gatewayspec=NULL;
char *outputtemplate=NULL;
char *instrumentation_file=NULL;
int timeout=3000; /* 3000ms request timeout */
int returnMultiVars=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 setReason("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 setReason("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 setReason("Variable value has an odd number of hex digits.");
b|=hexvalue(text[i++]);
if (b<0) return setReason("That doesn't look like hex to me");
if (vlen>=max_len) return setReason("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 setReason("Variable value from file too long");
fseek(f,0,SEEK_SET);
vlen=fread(value,1,flen,f);
if (vlen!=flen) return setReason("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 setReason("Variable value too long");
bcopy(&text[i],value,vlen);
*value_len=vlen;
return 0;
}
return 0;
}
int usage(char *complaint)
{
fprintf(stderr,"dna: %s\n",complaint);
@ -161,29 +80,7 @@ int usage(char *complaint)
exit(-1);
}
#ifndef DNA_NO_MAIN
const char *thisinstancepath=NULL;
const char *serval_instancepath()
{
if (thisinstancepath) return thisinstancepath;
const char *instancepath=getenv("SERVALINSTANCE_PATH");
if (!instancepath) instancepath=DEFAULT_INSTANCE_PATH;
return instancepath;
}
int form_serval_instance_path(char *buf, size_t bufsiz, const char *path)
{
if (snprintf(buf, bufsiz, "%s/%s", serval_instancepath(), path) < bufsiz)
return 1;
setReason("Cannot form pathname \"%s/%s\" -- buffer too small (%lu bytes)", serval_instancepath(), path, (unsigned long)bufsiz);
return 0;
}
int create_serval_instance_dir() {
return mkdirs(serval_instancepath(), 0700);
}
int main(int argc, char **argv)
int parseOldCommandLine(int argc, char **argv)
{
int c;
//char *pin=NULL;
@ -193,34 +90,9 @@ int main(int argc, char **argv)
int instance=-1;
int foregroundMode=0;
int clientMode=0;
#if defined WIN32
WSADATA wsa_data;
WSAStartup(MAKEWORD(1,1), &wsa_data);
#endif
memabuseInit();
srandomdev();
server_save_argv(argc, (const char*const*)argv);
/* If first argument starts with a dash, we assume it is for the old command line parser. */
if (!argv[1] || argv[1][0] != '-') {
/* Don't include name of program in arguments */
int return_value = parseCommandLine(argc - 1, (const char*const*)&argv[1]);
#if defined WIN32
WSACleanup();
#endif
return return_value;
}
fprintf(stderr,
"WARNING: The use of the old command line structure is being deprecated.\n"
" Type '%s help' to learn about the new command line structure.\n",
argv[0]);
while((c=getopt(argc,argv,"Ab:B:E:G:I:Sf:d:i:l:L:mnp:P:r:s:t:v:R:W:U:D:CO:M:N:")) != -1 )
{
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,"Ab:B:E:G:I:Sf:d:i:l:L:mnp:P:r:s:t:v:R:W:U:D:CO:M:N:")) != -1) {
switch(c)
{
case 'S': serverMode=1; break;
@ -358,11 +230,79 @@ int main(int argc, char **argv)
}
if (!clientMode) usage("Serval server and client utility.");
#if defined WIN32
WSACleanup();
#endif
/* Client mode: */
return 0;
}
#endif
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 setReason("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 setReason("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 setReason("Variable value has an odd number of hex digits.");
b|=hexvalue(text[i++]);
if (b<0) return setReason("That doesn't look like hex to me");
if (vlen>=max_len) return setReason("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 setReason("Variable value from file too long");
fseek(f,0,SEEK_SET);
vlen=fread(value,1,flen,f);
if (vlen!=flen) return setReason("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 setReason("Variable value too long");
bcopy(&text[i],value,vlen);
*value_len=vlen;
return 0;
}
return 0;
}

1
gateway.c
View File

@ -27,6 +27,7 @@ char *asterisk_binary="/data/data/org.servalproject/asterisk/sbin/asterisk";
char *temp_file="/data/data/org.servalproject/var/temp.out";
char *cmd_file="/data/data/org.servalproject/var/temp.cmd";
char *shell="/system/bin/sh";
char *gatewayspec=NULL;
typedef struct dna_gateway_extension {
char did[64];

65
main.c Normal file
View File

@ -0,0 +1,65 @@
/*
Serval daemon
Copyright (C) 2012 The Serval Project
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"
int main(int argc, char **argv)
{
#if defined WIN32
WSADATA wsa_data;
WSAStartup(MAKEWORD(1,1), &wsa_data);
#endif
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 (argv[1] && argv[1][0] == '-')
status = parseCommandLine(argc, (const char*const*)argv);
else
status = parseCommandLine(argc - 1, (const char*const*)&argv[1]);
#if defined WIN32
WSACleanup();
#endif
return status;
}
const char *thisinstancepath = NULL;
const char *serval_instancepath()
{
if (thisinstancepath)
return thisinstancepath;
const char *instancepath = getenv("SERVALINSTANCE_PATH");
if (!instancepath)
instancepath = DEFAULT_INSTANCE_PATH;
return instancepath;
}
int form_serval_instance_path(char *buf, size_t bufsiz, const char *path)
{
if (snprintf(buf, bufsiz, "%s/%s", serval_instancepath(), path) < bufsiz)
return 1;
WHYF("Cannot form pathname \"%s/%s\" -- buffer too small (%lu bytes)", serval_instancepath(), path, (unsigned long)bufsiz);
return 0;
}
int create_serval_instance_dir() {
return mkdirs(serval_instancepath(), 0700);
}

4
serval.h
View File

@ -451,7 +451,6 @@ int hlrSetVariable(unsigned char *hlr,int hofs,int varid,int varinstance,
unsigned char *value,int len);
int extractDid(unsigned char *packet,int *ofs,char *did);
char *hlrSid(unsigned char *hlr, int ofs, char *sid);
int parseAssignment(unsigned char *text,int *var_id,unsigned char *value,int *value_len);
int writeItem(char *sid,int var_id,int instance,unsigned char *value,
int value_start,int value_length,int flags,
int recvttl,struct sockaddr *recvaddr);
@ -1097,6 +1096,9 @@ typedef struct dna_identity_status {
int parseCommandLine(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,

1
server.c
View File

@ -38,6 +38,7 @@ static int server_getpid = 0;
unsigned char *hlr=NULL;
int hlr_size=0;
char *instrumentation_file=NULL;
FILE *i_f=NULL;
struct in_addr client_addr;