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

some refinement to dial request commandline utility.

Browse Source 
MDP reply to dial request is sometimes not forthcoming, but
if tried again, does solicit a response.  very weird.
This commit is contained in:
gardners 2012-04-22 07:16:18 +09:30
parent 19538216f6
commit 21cb1d9206
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
vomp.c
View File

@ -56,7 +56,6 @@ vomp_call_state *vomp_find_or_create_call(unsigned char *remote_sid,
{ {
int expired_slot=-1; int expired_slot=-1;
int i; int i;
dump_vomp_status();
printf("%d calls already in progress.\n",vomp_call_count); printf("%d calls already in progress.\n",vomp_call_count);
for(i=0;i<vomp_call_count;i++) for(i=0;i<vomp_call_count;i++)
{ {
@ -471,8 +470,6 @@ int vomp_mdp_event(overlay_mdp_frame *mdp,
call->local.session&=VOMP_SESSION_MASK; call->local.session&=VOMP_SESSION_MASK;
call->last_activity=overlay_gettime_ms(); call->last_activity=overlay_gettime_ms();
dump_vomp_status();
/* send status update to remote, thus causing call to be created /* send status update to remote, thus causing call to be created
(hopefully) at far end. */ (hopefully) at far end. */
vomp_send_status(call,VOMP_TELLREMOTE|VOMP_TELLINTERESTED); vomp_send_status(call,VOMP_TELLREMOTE|VOMP_TELLINTERESTED);
@ -571,7 +568,6 @@ int vomp_mdp_received(overlay_mdp_frame *mdp)
call->last_activity=overlay_gettime_ms(); call->last_activity=overlay_gettime_ms();
call->remote.sequence=sender_seq; call->remote.sequence=sender_seq;
call->remote.state=sender_state; call->remote.state=sender_state;
dump_vomp_status();
return vomp_send_status(call,VOMP_TELLREMOTE); return vomp_send_status(call,VOMP_TELLREMOTE);
} else { } else {
WHY("recvr_session!=0, looking for existing call"); WHY("recvr_session!=0, looking for existing call");
@ -588,7 +584,6 @@ int vomp_mdp_received(overlay_mdp_frame *mdp)
int combined_state=call->local.state<<3; int combined_state=call->local.state<<3;
combined_state|=sender_state; combined_state|=sender_state;
call->remote.state=sender_state; call->remote.state=sender_state;
dump_vomp_status();
WHYF("Far end is in state %s",vomp_describe_state(call->remote.state)); WHYF("Far end is in state %s",vomp_describe_state(call->remote.state));
WHYF("I am in state %s",vomp_describe_state(call->local.state)); WHYF("I am in state %s",vomp_describe_state(call->local.state));
switch(combined_state) { switch(combined_state) {
@ -856,8 +851,13 @@ int app_vomp_dial(int argc, char **argv, struct command_line_option *o)
{ {
WHY("Dial request failed."); WHY("Dial request failed.");
} }
if (mdp.packetTypeAndFlags==MDP_ERROR&&mdp.error.error)
fprintf(stderr,"Dial request failed: error=%d, message='%s'\n",
mdp.error.error,mdp.error.message);
else
printf("Dial request accepted.\n");
return WHY("Not implemented"); return 0;
} }
int overlay_mdp_getmyaddr(int index,unsigned char *sid) int overlay_mdp_getmyaddr(int index,unsigned char *sid)