o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

try to do better with headers

Browse source
This commit is contained in:
rsc 2005-05-07 22:37:26 +00:00
parent fc11cb4bbb
commit 857072dc11
1 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/libip/udp.c
View file

@ -6,23 +6,24 @@
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
/*
* prefix of all v4 addresses
* copied from libip because libc cannot depend on libip
*/
static uchar v4prefix[IPaddrlen] = {
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0xff, 0xff,
0, 0, 0, 0
};
long long
udpread(int fd, Udphdr *hdr, void *buf, long n) udpread(int fd, Udphdr *hdr, void *buf, long n)
{ {
struct sockaddr_in sin; struct sockaddr_in sin;
socklen_t len; socklen_t len;
len = sizeof sin;
if(getsockname(fd, (struct sockaddr*)&sin, &len) < 0)
return -1;
if(len != sizeof sin){
werrstr("getsockname acting weird");
return -1;
}
memset(hdr, 0, sizeof *hdr);
memmove(hdr->laddr, v4prefix, IPaddrlen);
*(u32int*)(hdr->laddr+12) = *(u32int*)&sin.sin_addr;
*(u16int*)hdr->lport = *(u16int*)&sin.sin_port;
len = sizeof sin; len = sizeof sin;
n = recvfrom(fd, buf, n, 0, (struct sockaddr*)&sin, &len); n = recvfrom(fd, buf, n, 0, (struct sockaddr*)&sin, &len);
if(n < 0) if(n < 0)
@ -31,10 +32,10 @@ udpread(int fd, Udphdr *hdr, void *buf, long n)
werrstr("recvfrom acting weird"); werrstr("recvfrom acting weird");
return -1; return -1;
} }
memset(hdr, 0, sizeof *hdr);
memmove(hdr->raddr, v4prefix, IPaddrlen); memmove(hdr->raddr, v4prefix, IPaddrlen);
*(u32int*)(hdr->raddr+12) = *(u32int*)&sin.sin_addr; *(u32int*)(hdr->raddr+12) = *(u32int*)&sin.sin_addr;
*(u16int*)hdr->rport = *(u16int*)&sin.sin_port; *(u16int*)hdr->rport = *(u16int*)&sin.sin_port;
return n; return n;
} }