mirror of
https://github.com/servalproject/serval-dna.git
synced 2025-01-18 02:39:44 +00:00
Replace DEBUG_HLR with DEBUG_KEYRING
Convert several fprintf(stderr,...) into DEBUGF() statements
This commit is contained in:
Andrew Bettison
parent
82648b7e63
commit
a69f637b3a
33
keyring.c
33
keyring.c
@ -247,8 +247,10 @@ void keyring_free_identity(keyring_identity *id)
|
||||
if (id->PKRPin) {
|
||||
/* Wipe pin before freeing (slightly tricky since this is a variable length string */
|
||||
for(i=0;id->PKRPin[i];i++) {
|
||||
fprintf(stderr,"clearing PIN char '%c'\n",id->PKRPin[i]);
|
||||
id->PKRPin[i]=' '; }
|
||||
if (debug & DEBUG_KEYRING)
|
||||
DEBUGF("clearing PIN char '%c'", id->PKRPin[i]);
|
||||
id->PKRPin[i]=' ';
|
||||
}
|
||||
i=0;
|
||||
|
||||
free(id->PKRPin); id->PKRPin=NULL;
|
||||
@ -973,15 +975,14 @@ int keyring_commit(keyring_file *k)
|
||||
k->contexts[cn]->KeyRingPin,
|
||||
k->contexts[cn]->identities[in]->PKRPin))
|
||||
errorCount++;
|
||||
else
|
||||
{
|
||||
else {
|
||||
/* Store */
|
||||
off_t file_offset
|
||||
=KEYRING_PAGE_SIZE
|
||||
*k->contexts[cn]->identities[in]->slot;
|
||||
if (!file_offset) {
|
||||
fprintf(stderr,"ID %d:%d has slot=0\n",
|
||||
cn,in);
|
||||
if (debug * DEBUG_KEYRING)
|
||||
DEBUGF("ID %d:%d has slot=0", cn,in);
|
||||
}
|
||||
else if (fseeko(k->file,file_offset,SEEK_SET))
|
||||
errorCount++;
|
||||
@ -1006,6 +1007,7 @@ int keyring_set_did(keyring_identity *id,char *did,char *name)
|
||||
int i;
|
||||
for(i=0;i<id->keypair_count;i++)
|
||||
if (id->keypairs[i]->type==KEYTYPE_DID) {
|
||||
if (debug & DEBUG_KEYRING)
|
||||
DEBUG("Identity contains DID");
|
||||
break;
|
||||
}
|
||||
@ -1026,6 +1028,7 @@ int keyring_set_did(keyring_identity *id,char *did,char *name)
|
||||
id->keypairs[i]->public_key=packedName;
|
||||
id->keypairs[i]->public_key_len=64;
|
||||
id->keypair_count++;
|
||||
if (debug & DEBUG_KEYRING)
|
||||
DEBUG("Created DID record for identity");
|
||||
}
|
||||
|
||||
@ -1131,7 +1134,8 @@ unsigned char *keyring_find_sas_private(keyring_file *k,unsigned char *sid,
|
||||
if (sas_public)
|
||||
*sas_public=
|
||||
k->contexts[cn]->identities[in]->keypairs[kp]->public_key;
|
||||
if (0) DEBUGF("Found SAS entry for %s*", alloca_tohex(sid, 7));
|
||||
if (debug & DEBUG_KEYRING)
|
||||
DEBUGF("Found SAS entry for %s*", alloca_tohex(sid, 7));
|
||||
RETURN(k->contexts[cn]->identities[in]->keypairs[kp]->private_key);
|
||||
}
|
||||
|
||||
@ -1196,11 +1200,13 @@ int keyring_mapping_request(keyring_file *k,overlay_mdp_frame *req)
|
||||
+slen;
|
||||
overlay_mdp_swap_src_dst(req);
|
||||
req->packetTypeAndFlags=MDP_TX; /* crypt and sign */
|
||||
if (debug & DEBUG_KEYRING) {
|
||||
DEBUG("Sent SID:SAS mapping mutual-signature");
|
||||
printf("%d byte reply is from %s:%u\n to %s:%u\n",
|
||||
DEBUGF("%d byte reply from %s:%u to %s:%u",
|
||||
req->out.payload_length,
|
||||
alloca_tohex_sid(req->out.src.sid),req->out.src.port,
|
||||
alloca_tohex_sid(req->out.dst.sid),req->out.dst.port);
|
||||
}
|
||||
return overlay_mdp_dispatch(req,1,NULL,0);
|
||||
} else {
|
||||
/* It's probably a response. */
|
||||
@ -1229,14 +1235,14 @@ int keyring_mapping_request(keyring_file *k,overlay_mdp_frame *req)
|
||||
signature,siglen,
|
||||
sas_public);
|
||||
if (r)
|
||||
return
|
||||
WHY("Verification of signed SID in key mapping assertion failed");
|
||||
return WHY("Verification of signed SID in key mapping assertion failed");
|
||||
/* These next two tests should never be able to fail, but let's just
|
||||
check anyway. */
|
||||
if (plain_len!=SID_SIZE)
|
||||
return WHY("key mapping signed block is wrong length");
|
||||
if (memcmp(plain,req->out.src.sid,SID_SIZE))
|
||||
return WHY("key mapping signed block is for wrong SID");
|
||||
if (debug & DEBUG_KEYRING)
|
||||
DEBUG("Key mapping looks valid");
|
||||
|
||||
/* work out where to put it */
|
||||
@ -1251,12 +1257,14 @@ int keyring_mapping_request(keyring_file *k,overlay_mdp_frame *req)
|
||||
bcopy(&req->out.src.sid,&sid_sas_mappings[i].sid[0],SID_SIZE);
|
||||
bcopy(sas_public,&sid_sas_mappings[i].sas_public[0],
|
||||
crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES);
|
||||
fprintf(stderr,"Mapping #%d (count=%d) SID=%s to SAS=%s*\n",i,
|
||||
if (debug & DEBUG_KEYRING)
|
||||
DEBUGF("Mapping #%d (count=%d) SID=%s to SAS=%s*\n",i,
|
||||
sid_sas_mapping_count,
|
||||
alloca_tohex_sid(sid_sas_mappings[i].sid),
|
||||
alloca_tohex_sid(sid_sas_mappings[i].sas_public));
|
||||
sid_sas_mappings[i].validP=1;
|
||||
sid_sas_mappings[i].last_request_time_in_ms=0;
|
||||
if (debug & DEBUG_KEYRING)
|
||||
DEBUG("Stored mapping");
|
||||
return 0;
|
||||
}
|
||||
@ -1289,7 +1297,8 @@ unsigned char *keyring_find_sas_public(keyring_file *k,unsigned char *sid)
|
||||
{
|
||||
if (memcmp(sid,sid_sas_mappings[i].sid,SID_SIZE)) continue;
|
||||
if (sid_sas_mappings[i].validP) {
|
||||
if (0) DEBUGF("Found SAS public entry for %s*", alloca_tohex(sid, 7));
|
||||
if (debug & DEBUG_KEYRING)
|
||||
DEBUGF("Found SAS public entry for %s*", alloca_tohex(sid, 7));
|
||||
RETURN(sid_sas_mappings[i].sas_public);
|
||||
}
|
||||
/* Don't flood the network with mapping requests */
|
||||
|
||||
2
log.c
2
log.c
@ -264,7 +264,7 @@ unsigned int debugFlagMask(const char *flagname) {
|
||||
else if (!strcasecmp(flagname,"packetformats")) return DEBUG_PACKETFORMATS;
|
||||
else if (!strcasecmp(flagname,"packetconstruction")) return DEBUG_PACKETCONSTRUCTION;
|
||||
else if (!strcasecmp(flagname,"gateway")) return DEBUG_GATEWAY;
|
||||
else if (!strcasecmp(flagname,"hlr")) return DEBUG_HLR;
|
||||
else if (!strcasecmp(flagname,"keyring")) return DEBUG_KEYRING;
|
||||
else if (!strcasecmp(flagname,"sockio")) return DEBUG_IO;
|
||||
else if (!strcasecmp(flagname,"frames")) return DEBUG_OVERLAYFRAMES;
|
||||
else if (!strcasecmp(flagname,"abbreviations")) return DEBUG_OVERLAYABBREVIATIONS;
|
||||
|
||||
2
serval.h
2
serval.h
@ -1132,7 +1132,7 @@ int overlay_saw_mdp_containing_frame(overlay_frame *f,long long now);
|
||||
#define DEBUG_RHIZOME_RX (1 << 8)
|
||||
#define DEBUG_PACKETFORMATS (1 << 9)
|
||||
#define DEBUG_GATEWAY (1 << 10)
|
||||
#define DEBUG_HLR (1 << 11) // Deprecated, TODO: delete
|
||||
#define DEBUG_KEYRING (1 << 11)
|
||||
#define DEBUG_IO (1 << 12)
|
||||
#define DEBUG_OVERLAYFRAMES (1 << 13)
|
||||
#define DEBUG_OVERLAYABBREVIATIONS (1 << 14)
|
||||
|
||||
93
server.c
93
server.c
@ -509,48 +509,40 @@ int processRequest(unsigned char *packet,int len,
|
||||
unsigned char *transaction_id,int recvttl, char *did,char *sid)
|
||||
{
|
||||
/* Find HLR entry by DID or SID, unless creating */
|
||||
int records_searched=0;
|
||||
|
||||
int prev_pofs=0;
|
||||
int pofs=OFS_PAYLOAD;
|
||||
|
||||
while(pofs<len)
|
||||
{
|
||||
if (debug&DEBUG_DNARESPONSES) DEBUGF(" processRequest: len=%d, pofs=%d, pofs_prev=%d",len,pofs,prev_pofs);
|
||||
while (pofs < len) {
|
||||
if (debug & DEBUG_DNARESPONSES)
|
||||
DEBUGF("len=%d, pofs=%d, pofs_prev=%d",len,pofs,prev_pofs);
|
||||
/* Avoid infinite loops */
|
||||
if (pofs<=prev_pofs) break;
|
||||
prev_pofs=pofs;
|
||||
|
||||
if (packet[pofs]==ACTION_CREATEHLR)
|
||||
{
|
||||
if (debug & DEBUG_DNARESPONSES)
|
||||
DEBUGF("action code 0x%02x @ packet offset 0x%x", packet[pofs], pofs);
|
||||
switch (packet[pofs]) {
|
||||
case ACTION_CREATEHLR: {
|
||||
/* Creating an HLR requires an initial DID number and definitely no SID -
|
||||
you can't choose a SID. */
|
||||
if (debug&DEBUG_HLR) DEBUGF("Creating a new HLR record. did='%s', sid='%s'",did,sid);
|
||||
if (!did[0]) return respondSimple(NULL,ACTION_DECLINED,NULL,0,transaction_id,recvttl,sender,CRYPT_CIPHERED|CRYPT_SIGNED);
|
||||
if (sid[0])
|
||||
return respondSimple(NULL,ACTION_DECLINED,NULL,0,transaction_id,
|
||||
recvttl,sender,CRYPT_CIPHERED|CRYPT_SIGNED);
|
||||
if (debug&DEBUG_HLR) DEBUG("Verified that create request supplies DID but not SID");
|
||||
|
||||
if (debug & DEBUG_DNARESPONSES)
|
||||
DEBUGF("Creating a new HLR record. did='%s', sid='%s'",did,sid);
|
||||
if (!did[0] || sid[0])
|
||||
return respondSimple(NULL, ACTION_DECLINED, NULL, 0, transaction_id, recvttl, sender, CRYPT_CIPHERED|CRYPT_SIGNED);
|
||||
if (debug & DEBUG_DNARESPONSES)
|
||||
DEBUG("Verified that create request supplies DID but not SID");
|
||||
/* Creating an identity is nice and easy now with the new keyring */
|
||||
keyring_identity *id=keyring_create_identity(keyring,keyring->contexts[0], "");
|
||||
if (id) keyring_set_did(id,did,"Mr. Smith");
|
||||
if (id)
|
||||
keyring_set_did(id, did, "Mr. Smith");
|
||||
if (id==NULL||keyring_commit(keyring))
|
||||
return respondSimple(NULL,ACTION_DECLINED,NULL,0,transaction_id,recvttl,
|
||||
sender,CRYPT_CIPHERED|CRYPT_SIGNED);
|
||||
return respondSimple(NULL, ACTION_DECLINED, NULL, 0, transaction_id, recvttl, sender, CRYPT_CIPHERED|CRYPT_SIGNED);
|
||||
else
|
||||
return respondSimple(id,ACTION_OKAY,NULL,0,transaction_id,recvttl,
|
||||
sender,CRYPT_CIPHERED|CRYPT_SIGNED);
|
||||
|
||||
pofs+=1;
|
||||
pofs+=1+SID_SIZE;
|
||||
return respondSimple(id, ACTION_OKAY, NULL, 0, transaction_id, recvttl, sender, CRYPT_CIPHERED|CRYPT_SIGNED);
|
||||
pofs += 1;
|
||||
pofs += 1 + SID_SIZE;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (debug&DEBUG_DNARESPONSES) DEBUGF("Looking at action code 0x%02x @ packet offset 0x%x",
|
||||
packet[pofs],pofs);
|
||||
switch(packet[pofs])
|
||||
{
|
||||
break;
|
||||
case ACTION_PAD: /* Skip padding */
|
||||
pofs++;
|
||||
pofs+=1+packet[pofs];
|
||||
@ -558,10 +550,9 @@ int processRequest(unsigned char *packet,int len,
|
||||
case ACTION_EOT: /* EOT */
|
||||
pofs=len;
|
||||
break;
|
||||
case ACTION_STATS:
|
||||
case ACTION_STATS: {
|
||||
/* short16 variable id,
|
||||
int32 value */
|
||||
{
|
||||
pofs++;
|
||||
short field=packet[pofs+1]+(packet[pofs]<<8);
|
||||
int value=packet[pofs+5]+(packet[pofs+4]<<8)+(packet[pofs+3]<<16)+(packet[pofs+2]<<24);
|
||||
@ -580,16 +571,15 @@ int processRequest(unsigned char *packet,int len,
|
||||
(unsigned char *)"Would be insecure",
|
||||
0,transaction_id,recvttl,
|
||||
sender,CRYPT_CIPHERED|CRYPT_SIGNED);
|
||||
|
||||
break;
|
||||
case ACTION_GET:
|
||||
{
|
||||
case ACTION_GET: {
|
||||
/* Limit transfer size to MAX_DATA_BYTES, plus an allowance for variable packing. */
|
||||
unsigned char data[MAX_DATA_BYTES+16];
|
||||
int dlen=0;
|
||||
int sendDone=0;
|
||||
|
||||
if (debug&DEBUG_HLR) dump("Request bytes",&packet[pofs],8);
|
||||
if (debug&DEBUG_DNARESPONSES)
|
||||
dump("Request bytes", &packet[pofs], 8);
|
||||
|
||||
pofs++;
|
||||
int var_id=packet[pofs];
|
||||
@ -602,13 +592,13 @@ int processRequest(unsigned char *packet,int len,
|
||||
|
||||
pofs+=2;
|
||||
|
||||
if (debug&DEBUG_DNARESPONSES) DEBUGF("Processing ACTION_GET (var_id=%02x, instance=%02x, pofs=0x%x, len=%d)",var_id,instance,pofs,len);
|
||||
if (debug&DEBUG_DNARESPONSES) {
|
||||
DEBUGF("Processing ACTION_GET (var_id=%02x, instance=%02x, pofs=0x%x, len=%d)",var_id,instance,pofs,len);
|
||||
DEBUGF("Looking for identities with sid=%s did='%s'", (sid&&sid[0])?sid:"null",did?did:"null");
|
||||
}
|
||||
|
||||
if (debug&DEBUG_HLR) DEBUGF("Looking for identities with sid='%s' / did='%s'",(sid&&sid[0])?sid:"null",did?did:"null");
|
||||
|
||||
/* Keyring only has DIDs in it for now.
|
||||
Location is implied, so we allow that */
|
||||
switch(var_id) {
|
||||
/* Keyring only has DIDs in it for now. Location is implied, so we allow that */
|
||||
switch (var_id) {
|
||||
case VAR_DIDS:
|
||||
case VAR_LOCATIONS:
|
||||
break;
|
||||
@ -617,7 +607,6 @@ int processRequest(unsigned char *packet,int len,
|
||||
(unsigned char *)"Unsupported variable",
|
||||
0,transaction_id,recvttl,
|
||||
sender,CRYPT_CIPHERED|CRYPT_SIGNED);
|
||||
|
||||
}
|
||||
|
||||
{
|
||||
@ -672,8 +661,7 @@ int processRequest(unsigned char *packet,int len,
|
||||
CRYPT_CIPHERED|CRYPT_SIGNED);
|
||||
/* Prepare new packet */
|
||||
dlen=0;
|
||||
if (packageVariableSegment(data,&dlen,&r,offset,
|
||||
MAX_DATA_BYTES+16))
|
||||
if (packageVariableSegment(data,&dlen,&r,offset, MAX_DATA_BYTES+16))
|
||||
return WHY("packageVariableSegment() failed.");
|
||||
responding_id = keyring->contexts[cn]->identities[in];
|
||||
|
||||
@ -693,8 +681,7 @@ int processRequest(unsigned char *packet,int len,
|
||||
if (lastin!=in||lastcn!=cn) {
|
||||
/* moved off last identity, so send waiting packet if there is
|
||||
one. */
|
||||
if (sendDone)
|
||||
{
|
||||
if (sendDone) {
|
||||
data[dlen++]=ACTION_DONE;
|
||||
data[dlen++]=sendDone&0xff;
|
||||
respondSimple(responding_id,ACTION_DATA,data,dlen,
|
||||
@ -702,16 +689,13 @@ int processRequest(unsigned char *packet,int len,
|
||||
recvttl,sender,CRYPT_CIPHERED|CRYPT_SIGNED);
|
||||
}
|
||||
sendDone=0;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
/* Now, see if we have a final queued packet which needs marking with
|
||||
DONE and then sending. */
|
||||
if (sendDone)
|
||||
{
|
||||
if (sendDone) {
|
||||
data[dlen++]=ACTION_DONE;
|
||||
data[dlen++]=sendDone&0xff;
|
||||
respondSimple(responding_id,ACTION_DATA,data,dlen,transaction_id,
|
||||
@ -756,14 +740,13 @@ int processRequest(unsigned char *packet,int len,
|
||||
}
|
||||
break;
|
||||
default:
|
||||
if (debug&DEBUG_PACKETFORMATS) DEBUGF("Asked to perform unsipported action at Packet offset = 0x%x",pofs);
|
||||
if (debug&DEBUG_PACKETFORMATS) dump("Packet",packet,len);
|
||||
return WHY("Asked to perform unsupported action.");
|
||||
if (debug & DEBUG_PACKETFORMATS) {
|
||||
DEBUGF("Asked to perform unsipported action at Packet offset = 0x%x", pofs);
|
||||
dump("Packet", packet, len);
|
||||
}
|
||||
return WHY("unsupported action");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (debug&DEBUG_HLR) DEBUGF("Searched %d HLR entries",records_searched);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user