mirrors/wmii
1
0
Fork 0
mirror of https://github.com/0intro/wmii synced 2025-04-03 12:13:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

fixed sin_port assignments in libixp2/socket.c

Browse Source
This commit is contained in:
Anselm R. Garbe 2006-01-23 14:59:59 +02:00
parent 6066d65b03
commit 9aad74df94
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libixp2/socket.c
View File

@ -47,10 +47,11 @@ connect_tcp_sock(char *host)
struct hostent *hp; struct hostent *hp;
char *port = strrchr(host, '!'); char *port = strrchr(host, '!');
const char *errstr = nil; const char *errstr = nil;
unsigned int prt;
*port = 0; *port = 0;
port++; port++;
addr.sin_port = cext_strtonum(port, 1024, 65535, &errstr); prt = cext_strtonum(port, 1024, 65535, &errstr);
if(errstr) if(errstr)
return -1; return -1;
@ -59,6 +60,7 @@ connect_tcp_sock(char *host)
return -1; return -1;
hp = gethostbyname(host); hp = gethostbyname(host);
addr.sin_family = AF_INET; addr.sin_family = AF_INET;
addr.sin_port = htons(prt);
bcopy(hp->h_addr, &addr.sin_addr, hp->h_length); bcopy(hp->h_addr, &addr.sin_addr, hp->h_length);
if(connect(fd, (struct sockaddr *) &addr, sizeof(struct sockaddr_in))) { if(connect(fd, (struct sockaddr *) &addr, sizeof(struct sockaddr_in))) {
@ -104,6 +106,7 @@ create_tcp_sock(char *host, char **errstr)
int fd; int fd;
struct sockaddr_in addr = { 0 }; struct sockaddr_in addr = { 0 };
char *port = strrchr(host, '!'); char *port = strrchr(host, '!');
unsigned int prt;
if(!port) { if(!port) {
*errstr = "no port provided in address"; *errstr = "no port provided in address";
@ -111,7 +114,7 @@ create_tcp_sock(char *host, char **errstr)
} }
*port = 0; *port = 0;
port++; port++;
addr.sin_port = cext_strtonum(port, 1024, 65535, (const char **)errstr); prt = cext_strtonum(port, 1024, 65535, (const char **)errstr);
if(*errstr) if(*errstr)
return -1; return -1;
signal(SIGPIPE, SIG_IGN); signal(SIGPIPE, SIG_IGN);
@ -120,7 +123,8 @@ create_tcp_sock(char *host, char **errstr)
return -1; return -1;
} }
addr.sin_family = AF_INET; addr.sin_family = AF_INET;
addr.sin_addr.s_addr = INADDR_ANY; addr.sin_addr.s_addr = htonl(INADDR_ANY);
addr.sin_port = htons(prt);
if(bind(fd, (struct sockaddr *) &addr, sizeof(struct sockaddr_in)) < 0) { if(bind(fd, (struct sockaddr *) &addr, sizeof(struct sockaddr_in)) < 0) {
*errstr = "cannot bind socket"; *errstr = "cannot bind socket";