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

Don't hand roll socket name generation. Don't check if it's abstract (since the paths start with nul it was a NOP previously anyway).

Browse Source
This commit is contained in:
Daniel O'Connor 2012-06-24 14:32:26 +09:30
parent 626ddee8da
commit 38bf7c3a67
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
overlay_mdp.c
View File

@ -1210,12 +1210,16 @@ int overlay_mdp_client_poll(long long timeout_ms)
int overlay_mdp_recv(overlay_mdp_frame *mdp,int *ttl) int overlay_mdp_recv(overlay_mdp_frame *mdp,int *ttl)
{ {
char mdp_socket_name[101]; struct sockaddr_un mdpname;
if (!FORM_SERVAL_INSTANCE_PATH(mdp_socket_name, "mdp.socket")) socklen_t mdplen;
return WHY("Could not find mdp socket");
socket_setname(&mdpname, confValueGet("mdp.socket", DEFAULT_MDP_SOCKET_NAME), &mdplen);
/* Check if reply available */ /* Check if reply available */
fcntl(mdp_client_socket, F_SETFL, fcntl(mdp_client_socket, F_GETFL, NULL)|O_NONBLOCK); fcntl(mdp_client_socket, F_SETFL, fcntl(mdp_client_socket, F_GETFL, NULL)|O_NONBLOCK);
/* XXX: Why not just pass in a struct sockaddr_un? DOC 2012/06/24 */
unsigned char recvaddrbuffer[1024]; unsigned char recvaddrbuffer[1024];
bzero(recvaddrbuffer, sizeof(recvaddrbuffer));
struct sockaddr *recvaddr=(struct sockaddr *)recvaddrbuffer; struct sockaddr *recvaddr=(struct sockaddr *)recvaddrbuffer;
unsigned int recvaddrlen=sizeof(recvaddrbuffer); unsigned int recvaddrlen=sizeof(recvaddrbuffer);
struct sockaddr_un *recvaddr_un; struct sockaddr_un *recvaddr_un;
@ -1223,24 +1227,23 @@ int overlay_mdp_recv(overlay_mdp_frame *mdp,int *ttl)
int len = recvwithttl(mdp_client_socket,(unsigned char *)mdp, int len = recvwithttl(mdp_client_socket,(unsigned char *)mdp,
sizeof(overlay_mdp_frame),ttl,recvaddr,&recvaddrlen); sizeof(overlay_mdp_frame),ttl,recvaddr,&recvaddrlen);
recvaddr_un=(struct sockaddr_un *)recvaddr; recvaddr_un=(struct sockaddr_un *)recvaddr;
/* Null terminate received address so that the stat() call below can succeed */
if (recvaddrlen<1024) recvaddrbuffer[recvaddrlen]=0;
if (len>0) { if (len>0) {
#ifndef USE_ABSTRACT_NAMESPACE
/* Make sure recvaddr matches who we sent it to */ /* Make sure recvaddr matches who we sent it to */
if (strncmp(mdp_socket_name, recvaddr_un->sun_path, sizeof(recvaddr_un->sun_path))) { #ifndef USE_ABSTRACT_NAMESPACE
if (strncmp(mdpname.sun_path, recvaddr_un->sun_path, sizeof(recvaddr_un->sun_path))) {
/* Okay, reply was PROBABLY not from the server, but on OSX if the path /* Okay, reply was PROBABLY not from the server, but on OSX if the path
has a symlink in it, it is resolved in the reply path, but might not has a symlink in it, it is resolved in the reply path, but might not
be in the request path (mdp_socket_name), thus we need to stat() and be in the request path (mdp_socket_name), thus we need to stat() and
compare inode numbers etc */ compare inode numbers etc */
struct stat sb1,sb2; struct stat sb1,sb2;
if (stat(mdp_socket_name,&sb1)) return WHY("stat(mdp_socket_name) failed, so could not verify that reply came from MDP server"); if (stat(mdpname.sun_path,&sb1)) return WHY("stat(mdp_socket_name) failed, so could not verify that reply came from MDP server");
if (stat(recvaddr_un->sun_path,&sb2)) return WHY("stat(ra->sun_path) failed, so could not verify that reply came from MDP server"); if (stat(recvaddr_un->sun_path,&sb2)) return WHY("stat(ra->sun_path) failed, so could not verify that reply came from MDP server");
if ((sb1.st_ino!=sb2.st_ino)||(sb1.st_dev!=sb2.st_dev)) if ((sb1.st_ino!=sb2.st_ino)||(sb1.st_dev!=sb2.st_dev))
return WHY("Reply did not come from server"); return WHY("Reply did not come from server");
} }
#endif #endif
/* XXX: Should check abstract namespace socket - DOC 2012/06/24 */
int expected_len = overlay_mdp_relevant_bytes(mdp); int expected_len = overlay_mdp_relevant_bytes(mdp);
if (len < expected_len){ if (len < expected_len){