ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-02-21 01:42:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove more obsolete and unused code

Browse Source
This commit is contained in:
Andrew Bettison 2012-06-25 15:40:35 +09:30
parent 67e2e98867
commit c335310b45
3 changed files with 0 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
client.c
View File

@ -221,62 +221,6 @@ int packetSendRequest(int method,unsigned char *packet,int packet_len,int batchP
return 0;
}
/* Create a new HLR entry on a peer.
Should always try localhost as first peer, which is why
sendToPeers() does it that way. We just have to remember to
ask for serialised attempts, rather than all at once.
*/
int requestNewHLR(char *did,char *pin,char *sid,
int recvttl,struct sockaddr *recvaddr)
{
unsigned char packet[8000];
int packet_len=0;
struct response_set responses;
unsigned char transaction_id[TRANSID_SIZE];
bzero(&responses,sizeof(responses));
/* Prepare the request packet */
if (packetMakeHeader(packet,8000,&packet_len,NULL,CRYPT_PUBLIC)) return -1;
bcopy(&packet[OFS_TRANSIDFIELD],transaction_id,TRANSID_SIZE);
if (packetSetDid(packet,8000,&packet_len,did)) return -1;
if (packetAddHLRCreateRequest(packet,8000,&packet_len)) return -1;
if (packetFinalise(packet,8000,recvttl,&packet_len,CRYPT_PUBLIC)) return -1;
/* Send it to peers, starting with ourselves, one at a time until one succeeds.
XXX - This could take a while if we have long timeouts for each. */
if (packetSendRequest(REQ_SERIAL,packet,packet_len,NONBATCH,
transaction_id,recvaddr,&responses)) return -1;
/* Extract response */
if (debug&DEBUG_DNARESPONSES) dumpResponses(&responses);
if (!responses.response_count) {
printf("NOREPLY\n");
return -1;
}
switch(responses.responses->code)
{
case ACTION_DECLINED:
printf("DECLINED\n");
return -1;
break;
case ACTION_OKAY:
{
char sid[SID_STRLEN+1];
int ofs=0;
extractSid(&responses.responses->sid[0],&ofs,&sid[0]);
printf("OK:%s\n",sid);
}
return 0;
break;
default:
printf("ERROR:Unknown response 0x%02x\n",responses.responses->code);
return -1;
}
return WHY("Request creation of new HLR not implemented");
}
/* Some data types can end in @ if they require the address of the sender to be appended for correct local interpretation */
int fixResponses(struct response_set *responses)
{

14
packetformats.c
View File

@ -192,20 +192,6 @@ int packetSetDid(unsigned char *packet,int packet_maxlen,int *packet_len,char *d
return stowDid(packet,&ofs,did);
}
int packetSetSid(unsigned char *packet,int packet_maxlen,int *packet_len,char *sid)
{
/* Convert and store hex formatted sid */
int ofs=OFS_SIDDIDFIELD; /* where the DID/subscriber ID gets written */
if (strlen(sid)!=64) {
if (debug&DEBUG_PACKETFORMATS) fprintf(stderr,"Invalid SID: [%s] - should be 64 hex digits\n",sid);
return WHY("SID must consist of 64 hex digits");
}
packet[ofs++]=0x01; /* SID */
return stowSid(packet,ofs,sid);
}
int packetSetSidFromId(unsigned char *packet,int packet_maxlen,int *packet_len,
keyring_identity *id)
{

5
serval.h
View File

@ -426,9 +426,6 @@ int respondSimple(keyring_identity *id,
int action,unsigned char *action_text,int action_len,
unsigned char *transaction_id,int recvttl,
struct sockaddr *recvaddr,int cryptoFlags);
int requestItem(char *did,char *sid,char *item,int instance,unsigned char *buffer,int buffer_length,int *len,
unsigned char *transaction_id);
int requestNewHLR(char *did,char *pin,char *sid,int recvttl,struct sockaddr *recvaddr);
long long gettime_ms();
int server_pid();
void server_save_argv(int argc, const char *const *argv);
@ -448,8 +445,6 @@ int process_packet(unsigned char *packet,int len,
int recvttl,struct sockaddr *sender,int sender_len);
int packetMakeHeader(unsigned char *packet,int packet_maxlen,int *packet_len,unsigned char *transaction_id,int cryptoflags);
int packetSetDid(unsigned char *packet,int packet_maxlen,int *packet_len,char *did);
// Deprecated
// int packetSetSid(unsigned char *packet,int packet_maxlen,int *packet_len,char *sid);
int packetSetSidFromId(unsigned char *packet,int packet_maxlen,int *packet_len,
keyring_identity *id);
int packetFinalise(unsigned char *packet,int packet_maxlen,int recvttl,