ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2024-12-22 14:32:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MDP client socket gets bound to name before sending frame, and

Browse Source 
socket file gets deleted when exiting.  MDP server doesn't seem
to be able to reply to packets yet -- that's next on the queue to
fix.
This commit is contained in:
gardners 2012-03-19 16:35:49 +10:30
parent 3991c3eff4
commit 8884339e31
1 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
overlay_mdp.c
View File

@ -146,11 +146,15 @@ int overlay_mdp_poll()
break; break;
default: default:
/* Client is not allowed to send any other frame type */ /* Client is not allowed to send any other frame type */
WHY("Illegal frame type.");
mdp->packetTypeAndFlags=MDP_ERROR; mdp->packetTypeAndFlags=MDP_ERROR;
mdp->error.error=2; mdp->error.error=2;
snprintf(mdp->error.message,128,"Illegal request type. Clients may use only MDP_TX or MDP_BIND."); snprintf(mdp->error.message,128,"Illegal request type. Clients may use only MDP_TX or MDP_BIND.");
int len=4+4+strlen(mdp->error.message)+1; int len=4+4+strlen(mdp->error.message)+1;
errno=0;
int e=sendto(mdp_named_socket,mdp,len,0,(struct sockaddr *)&recvaddr,recvaddrlen); int e=sendto(mdp_named_socket,mdp,len,0,(struct sockaddr *)&recvaddr,recvaddrlen);
perror("sendto");
} }
} }
@ -167,6 +171,8 @@ int mdp_client_socket=-1;
int overlay_mdp_dispatch(overlay_mdp_frame *mdp,int flags,int timeout_ms) int overlay_mdp_dispatch(overlay_mdp_frame *mdp,int flags,int timeout_ms)
{ {
int len=4; int len=4;
char mdp_temporary_socket[1024];
mdp_temporary_socket[0]=0;
/* Minimise frame length to save work and prevent accidental disclosure of /* Minimise frame length to save work and prevent accidental disclosure of
memory contents. */ memory contents. */
@ -189,6 +195,20 @@ int overlay_mdp_dispatch(overlay_mdp_frame *mdp,int flags,int timeout_ms)
perror("socket"); perror("socket");
return WHY("Could not open socket to MDP server"); return WHY("Could not open socket to MDP server");
} }
/* We must bind to a temporary file name */
snprintf(mdp_temporary_socket,1024,"%s/mdp-client.socket",serval_instancepath());
unlink(mdp_temporary_socket);
struct sockaddr_un name;
name.sun_family = AF_UNIX;
snprintf(&name.sun_path[0],100,mdp_temporary_socket);
int len = 1+strlen(&name.sun_path[0]) + sizeof(name.sun_family)+1;
int r=bind(mdp_client_socket, (struct sockaddr *)&name, len);
if (r) {
WHY("Could not bind MDP client socket to file name");
perror("bind");
return -1;
}
} }
/* Construct name of socket to send to. */ /* Construct name of socket to send to. */
@ -196,6 +216,7 @@ int overlay_mdp_dispatch(overlay_mdp_frame *mdp,int flags,int timeout_ms)
mdp_socket_name[100]=0; mdp_socket_name[100]=0;
snprintf(mdp_socket_name,100,"%s/mdp.socket",serval_instancepath()); snprintf(mdp_socket_name,100,"%s/mdp.socket",serval_instancepath());
if (mdp_socket_name[100]) { if (mdp_socket_name[100]) {
if (mdp_temporary_socket[0]) unlink(mdp_temporary_socket);
return WHY("instance path is too long (unix domain named sockets have a short maximum path length)"); return WHY("instance path is too long (unix domain named sockets have a short maximum path length)");
} }
struct sockaddr_un name; struct sockaddr_un name;
@ -211,9 +232,11 @@ int overlay_mdp_dispatch(overlay_mdp_frame *mdp,int flags,int timeout_ms)
snprintf(mdp->error.message,128,"Error sending frame to MDP server."); snprintf(mdp->error.message,128,"Error sending frame to MDP server.");
/* Clear socket so that we have the chance of reconnecting */ /* Clear socket so that we have the chance of reconnecting */
mdp_client_socket=-1; mdp_client_socket=-1;
if (mdp_temporary_socket[0]) unlink(mdp_temporary_socket);
return -1; return -1;
} else { } else {
WHY("packet sent"); WHY("packet sent");
if (mdp_temporary_socket[0]) unlink(mdp_temporary_socket);
if (!(flags&MDP_AWAITREPLY)) return 0; if (!(flags&MDP_AWAITREPLY)) return 0;
} }
@ -227,11 +250,12 @@ int overlay_mdp_dispatch(overlay_mdp_frame *mdp,int flags,int timeout_ms)
mdp->packetTypeAndFlags=MDP_ERROR; mdp->packetTypeAndFlags=MDP_ERROR;
mdp->error.error=1; mdp->error.error=1;
snprintf(mdp->error.message,128,"Timeout waiting for reply to MDP packet (packet was successfully sent)."); snprintf(mdp->error.message,128,"Timeout waiting for reply to MDP packet (packet was successfully sent).");
if (mdp_temporary_socket[0]) unlink(mdp_temporary_socket);
return -1; return -1;
} }
/* Check if reply available */ /* Check if reply available */
if (mdp_temporary_socket[0]) unlink(mdp_temporary_socket);
return WHY("Not implemented"); return WHY("Not implemented");
} }