From 44daf03024fbf7cbffa10349044786f6ab784821 Mon Sep 17 00:00:00 2001 From: "Tomas Chvatal (scarabeus)" Date: Wed, 22 Oct 2008 22:51:24 +0200 Subject: Revert "X" This reverts commit e12753d2ec9db83ec08bb9db63902a82fb245cdd. --- src/net/udp.c | 517 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 259 insertions(+), 258 deletions(-) (limited to 'src/net/udp.c') diff --git a/src/net/udp.c b/src/net/udp.c index 6852834..f654a75 100644 --- a/src/net/udp.c +++ b/src/net/udp.c @@ -26,389 +26,390 @@ #include "udp.h" -sock_udp_t * -newSockUdp(int proto) +sock_udp_t* newSockUdp(int proto) { - sock_udp_t *new; + sock_udp_t *new; - new = malloc(sizeof(sock_udp_t)); - memset(new, 0, sizeof(sock_udp_t)); - new->proto = proto; + new = malloc( sizeof(sock_udp_t) ); + memset(new, 0, sizeof(sock_udp_t)); + new->proto = proto; - return new; + return new; } -void -destroySockUdp(sock_udp_t * p) +void destroySockUdp(sock_udp_t *p) { - assert(p != NULL); - free(p); + assert( p != NULL ); + free(p); } -sock_udp_t * -bindUdpSocket(char *address, int port, int proto) +sock_udp_t* bindUdpSocket(char *address, int port, int proto) { - sock_udp_t *new; - int res = -1; // no warninng + sock_udp_t *new; + int res = -1; // no warninng - assert(port > 0 && port < 65535); + assert( port > 0 && port < 65535 ); - new = newSockUdp(proto); + new = newSockUdp(proto); - assert(new != NULL); + assert( new != NULL ); - if (new->proto == PROTO_UDPv4) { - new->sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); - } + if( new->proto == PROTO_UDPv4 ) + { + new->sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + } #ifdef SUPPORT_IPv6 - if (new->proto == PROTO_UDPv6) { - new->sock = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP); - } + if( new->proto == PROTO_UDPv6 ) + { + new->sock = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP); + } #endif - if (new->sock < 0) { - fprintf(stderr, _("Unable to create socket when binding!\n")); - destroySockUdp(new); + if( new->sock < 0 ) + { + fprintf(stderr, _("Unable to create socket when binding!\n")); + destroySockUdp(new); #ifdef __WIN32__ - WSACleanup(); + WSACleanup(); #endif - return NULL; - } + return NULL; + } - memset(&(new->sockAddr), 0, sizeof(new->sockAddr)); + memset(&(new->sockAddr), 0, sizeof(new->sockAddr)); - if (new->proto == PROTO_UDPv4) { - new->sockAddr.sin_family = AF_INET; - new->sockAddr.sin_port = htons(port); - new->sockAddr.sin_addr.s_addr = inet_addr(address); + if( new->proto == PROTO_UDPv4 ) + { + new->sockAddr.sin_family = AF_INET; + new->sockAddr.sin_port = htons(port); + new->sockAddr.sin_addr.s_addr = inet_addr(address); - res = - bind(new->sock, (struct sockaddr *) &(new->sockAddr), - sizeof(new->sockAddr)); - } + res = bind(new->sock, (struct sockaddr *)&(new->sockAddr), sizeof(new->sockAddr)); + } #ifdef SUPPORT_IPv6 - if (new->proto == PROTO_UDPv6) { - new->sockAddr6.sin6_family = AF_INET6; - new->sockAddr6.sin6_port = htons(port); - inet_pton(AF_INET6, address, &(new->sockAddr6.sin6_addr)); - - res = - bind(new->sock, (struct sockaddr *) &(new->sockAddr6), - sizeof(new->sockAddr6)); - } + if( new->proto == PROTO_UDPv6 ) + { + new->sockAddr6.sin6_family = AF_INET6; + new->sockAddr6.sin6_port = htons(port); + inet_pton(AF_INET6, address, &(new->sockAddr6.sin6_addr)); + + res = bind(new->sock, (struct sockaddr *)&(new->sockAddr6), sizeof(new->sockAddr6)); + } #endif - if (res < 0) { - fprintf(stderr, _("Unable to set socket %s %d!\n"), address, port); - destroySockUdp(new); + if( res < 0 ) + { + fprintf(stderr, _("Unable to set socket %s %d!\n"), address, port); + destroySockUdp(new); #ifdef __WIN32__ - WSACleanup(); + WSACleanup(); #endif - return NULL; - } + return NULL; + } - return new; + return new; } -sock_udp_t * -connectUdpSocket(char *address, int port, int proto) +sock_udp_t* connectUdpSocket(char *address, int port, int proto) { - sock_udp_t *new; + sock_udp_t *new; - assert(address != NULL); - assert(port > 0 && port < 65536); + assert( address != NULL ); + assert( port > 0 && port < 65536 ); - new = newSockUdp(proto); + new = newSockUdp(proto); - assert(new != NULL); + assert( new != NULL ); - if (new->proto == PROTO_UDPv4) { - new->sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); - } + if( new->proto == PROTO_UDPv4 ) + { + new->sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + } #ifdef SUPPORT_IPv6 - if (new->proto == PROTO_UDPv6) { - new->sock = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP); - } + if( new->proto == PROTO_UDPv6 ) + { + new->sock = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP); + } #endif - if (new->sock < 0) { - fprintf(stderr, _("Unable to create socket when connecting!\n")); - destroySockUdp(new); + if( new->sock < 0 ) + { + fprintf(stderr, _("Unable to create socket when connecting!\n")); + destroySockUdp(new); #ifdef __WIN32__ - WSACleanup(); + WSACleanup(); #endif - return NULL; - } + return NULL; + } - memset(&(new->sockAddr), 0, sizeof(new->sockAddr)); + memset(&(new->sockAddr), 0, sizeof(new->sockAddr)); - if (new->proto == PROTO_UDPv4) { - new->sockAddr.sin_family = AF_INET; - new->sockAddr.sin_port = htons(port); - new->sockAddr.sin_addr.s_addr = inet_addr(address); - } + if( new->proto == PROTO_UDPv4 ) + { + new->sockAddr.sin_family = AF_INET; + new->sockAddr.sin_port = htons(port); + new->sockAddr.sin_addr.s_addr = inet_addr(address); + } #ifdef SUPPORT_IPv6 - if (new->proto == PROTO_UDPv6) { - new->sockAddr6.sin6_family = AF_INET6; - new->sockAddr6.sin6_port = htons(port); - inet_pton(AF_INET6, address, &(new->sockAddr6.sin6_addr)); - } + if( new->proto == PROTO_UDPv6 ) + { + new->sockAddr6.sin6_family = AF_INET6; + new->sockAddr6.sin6_port = htons(port); + inet_pton(AF_INET6, address, &(new->sockAddr6.sin6_addr)); + } #endif - return new; + return new; } -int -setUdpSockNonBlock(sock_udp_t * p) +int setUdpSockNonBlock(sock_udp_t *p) { - /* Set to nonblocking socket mode */ + /* Set to nonblocking socket mode */ #ifndef __WIN32__ - int oldFlag; + int oldFlag; - oldFlag = fcntl(p->sock, F_GETFL, 0); + oldFlag = fcntl (p->sock, F_GETFL, 0); - if (fcntl(p->sock, F_SETFL, oldFlag | O_NONBLOCK) == -1) { - return -1; - } + if( fcntl(p->sock, F_SETFL, oldFlag | O_NONBLOCK) == -1 ) + { + return -1; + } #else - unsigned long arg = 1; - // Operation is FIONBIO. Parameter is pointer on non-zero number. - if (ioctlsocket(p->sock, FIONBIO, &arg) == SOCKET_ERROR) { - WSACleanup(); - return -1; - } + unsigned long arg = 1; + // Operation is FIONBIO. Parameter is pointer on non-zero number. + if( ioctlsocket(p->sock, FIONBIO, &arg) == SOCKET_ERROR ) + { + WSACleanup(); + return -1; + } #endif - return 0; + return 0; } -int -readUdpSocket(sock_udp_t * src, sock_udp_t * dst, void *address, int len) +int readUdpSocket(sock_udp_t *src, sock_udp_t *dst, void *address, int len) { - int addrlen; - int size = -1; // no warninng + int addrlen; + int size = -1; // no warninng - assert(src != NULL); - assert(dst != NULL); - assert(address != NULL); + assert( src != NULL ); + assert( dst != NULL ); + assert( address != NULL ); - if (dst->proto == PROTO_UDPv4) { - addrlen = sizeof(src->sockAddr); + if( dst->proto == PROTO_UDPv4 ) + { + addrlen = sizeof(src->sockAddr); #ifndef __WIN32 - size = - recvfrom(src->sock, address, len, 0, - (struct sockaddr *) &dst->sockAddr, - (socklen_t *) & addrlen); + size = recvfrom(src->sock, address, len, 0, (struct sockaddr *)&dst->sockAddr, (socklen_t *)&addrlen); #else - size = - recvfrom(src->sock, address, len, 0, - (struct sockaddr *) &dst->sockAddr, (int *) &addrlen); + size = recvfrom(src->sock, address, len, 0, (struct sockaddr *)&dst->sockAddr, (int *)&addrlen); #endif - } + } #ifdef SUPPORT_IPv6 - if (dst->proto == PROTO_UDPv6) { - addrlen = sizeof(src->sockAddr6); + if( dst->proto == PROTO_UDPv6 ) + { + addrlen = sizeof(src->sockAddr6); - size = recvfrom(src->sock, address, len, 0, - (struct sockaddr *) &dst->sockAddr6, - (socklen_t *) & addrlen); - } + size = recvfrom(src->sock, address, len, 0, + (struct sockaddr *)&dst->sockAddr6, (socklen_t *)&addrlen); + } #endif - dst->sock = src->sock; + dst->sock = src->sock; - if (size < 0) { - char str_ip[STR_IP_SIZE]; + if( size < 0 ) + { + char str_ip[STR_IP_SIZE]; - getSockUdpIp(dst, str_ip, STR_IP_SIZE); + getSockUdpIp(dst, str_ip, STR_IP_SIZE); - fprintf(stderr, _("Unable to read form socket %d %s %d!\n"), size, - str_ip, getSockUdpPort(dst)); + fprintf(stderr, _("Unable to read form socket %d %s %d!\n"), size, str_ip, getSockUdpPort(dst)); #ifdef __WIN32__ - WSACleanup(); + WSACleanup(); #endif - return -1; - } + return -1; + } - return size; + return size; } -int -writeUdpSocket(sock_udp_t * src, sock_udp_t * dst, void *address, int len) +int writeUdpSocket(sock_udp_t *src, sock_udp_t *dst, void *address, int len) { - int addrlen; - int size = -1; // no warninng + int addrlen; + int size = -1; // no warninng - assert(src != NULL); - assert(dst != NULL); - assert(address != NULL); + assert( src != NULL ); + assert( dst != NULL ); + assert( address != NULL ); - if (dst->proto == PROTO_UDPv4) { - addrlen = sizeof(src->sockAddr); + if( dst->proto == PROTO_UDPv4 ) + { + addrlen = sizeof(src->sockAddr); - size = - sendto(src->sock, address, len, 0, - (struct sockaddr *) &dst->sockAddr, addrlen); - } + size = sendto(src->sock, address, len, 0, (struct sockaddr *)&dst->sockAddr, addrlen); + } #ifdef SUPPORT_IPv6 - if (dst->proto == PROTO_UDPv6) { - addrlen = sizeof(src->sockAddr6); + if( dst->proto == PROTO_UDPv6 ) + { + addrlen = sizeof(src->sockAddr6); - size = - sendto(src->sock, address, len, 0, - (struct sockaddr *) &dst->sockAddr6, addrlen); - } + size = sendto(src->sock, address, len, 0, (struct sockaddr *)&dst->sockAddr6, addrlen); + } #endif - if (size < 0) { - char str_ip[STR_IP_SIZE]; + if( size < 0 ) + { + char str_ip[STR_IP_SIZE]; - getSockUdpIp(dst, str_ip, STR_IP_SIZE); + getSockUdpIp(dst, str_ip, STR_IP_SIZE); - fprintf(stderr, _("Unable to write on socket %d %s %d!\n"), size, - str_ip, getSockUdpPort(dst)); + fprintf(stderr, _("Unable to write on socket %d %s %d!\n"), size, str_ip, getSockUdpPort(dst)); #ifdef __WIN32__ - WSACleanup(); + WSACleanup(); #endif - return -1; - } + return -1; + } - return size; + return size; } -void -getSockUdpIp(sock_udp_t * p, char *str_ip, int len) +void getSockUdpIp(sock_udp_t *p, char *str_ip, int len) { - assert(p != NULL); - assert(str_ip != NULL); + assert( p != NULL ); + assert( str_ip != NULL ); - - if (p->proto == PROTO_UDPv4) { + + if( p->proto == PROTO_UDPv4 ) + { #ifndef __WIN32__ - inet_ntop(AF_INET, &(p->sockAddr.sin_addr), str_ip, len); + inet_ntop(AF_INET, &(p->sockAddr.sin_addr), str_ip, len); #else - strcpy(str_ip, inet_ntoa(p->sockAddr.sin_addr)); - //printf("strcpy(str_ip, inet_ntoa(p->sockAddr.sin_addr));\n"); + strcpy(str_ip, inet_ntoa(p->sockAddr.sin_addr)); + //printf("strcpy(str_ip, inet_ntoa(p->sockAddr.sin_addr));\n"); #endif - } + } #ifdef SUPPORT_IPv6 - if (p->proto == PROTO_UDPv6) { - inet_ntop(AF_INET6, &(p->sockAddr6.sin6_addr), str_ip, len); - } + if( p->proto == PROTO_UDPv6 ) + { + inet_ntop(AF_INET6, &(p->sockAddr6.sin6_addr), str_ip, len); + } #endif } -int -getSockUdpPort(sock_udp_t * p) +int getSockUdpPort(sock_udp_t *p) { - assert(p != NULL); + assert( p != NULL ); - if (p->proto == PROTO_UDPv4) { - return htons(p->sockAddr.sin_port); - } + if( p->proto == PROTO_UDPv4 ) + { + return htons(p->sockAddr.sin_port); + } #ifdef SUPPORT_IPv6 - if (p->proto == PROTO_UDPv6) { - return htons(p->sockAddr6.sin6_port); - } + if( p->proto == PROTO_UDPv6 ) + { + return htons(p->sockAddr6.sin6_port); + } #endif - assert(!_("Bad IP proto!")); + assert( ! _("Bad IP proto!") ); - return -1; + return -1; } -void -closeUdpSocket(sock_udp_t * p) +void closeUdpSocket(sock_udp_t *p) { - assert(p != NULL); + assert( p != NULL ); #ifndef __WIN32__ - close(p->sock); + close(p->sock); #else - closesocket(p->sock); - //WSACleanup(); //kdyz ukoncime socket dobre neni treba cleanup + closesocket(p->sock); + //WSACleanup(); //kdyz ukoncime socket dobre neni treba cleanup #endif - destroySockUdp(p); + destroySockUdp(p); } #if 0 -static int -myWait(sock_udp_t * p) +static int myWait(sock_udp_t *p) { - fd_set readfds; - fd_set errorfds; - struct timeval tv; - int max_fd; - - tv.tv_sec = 1; - tv.tv_usec = 0; - - FD_ZERO(&readfds); - FD_ZERO(&errorfds); - max_fd = p->sock; - - FD_SET(p->sock, &readfds); - FD_SET(p->sock, &errorfds); - - select(max_fd + 1, &readfds, (fd_set *) 0, &errorfds, &tv); - - if (FD_ISSET(p->sock, &readfds)) { - FD_CLR(p->sock, &readfds); - return 1; - } - - return 0; + fd_set readfds; + fd_set errorfds; + struct timeval tv; + int max_fd; + + tv.tv_sec = 1; + tv.tv_usec = 0; + + FD_ZERO(&readfds); + FD_ZERO(&errorfds); + max_fd = p->sock; + + FD_SET(p->sock, &readfds); + FD_SET(p->sock, &errorfds); + + select(max_fd+1, &readfds, (fd_set *)0, &errorfds, &tv); + + if( FD_ISSET(p->sock, &readfds) ) + { + FD_CLR(p->sock, &readfds); + return 1; + } + + return 0; } -int -main(int argc, char *argv[]) +int main(int argc, char *argv[]) { - sock_udp_t *sock; - char buf[BUFSIZE]; - int ret; - - if (strcmp(argv[1], "s") == 0) { - sock_udp_t *cli; - - //sock = bindUdpSocket("::1", atoi(argv[2]), PROTO_UDPv6 ); - sock = bindUdpSocket("127.0.0.1", atoi(argv[2]), PROTO_UDPv4); - - //cli = newSockUdp(PROTO_UDPv6); - cli = newSockUdp(PROTO_UDPv4); - - while (1) { - while (myWait(sock) == 0); - - memset(buf, 0, BUFSIZE); - ret = readUdpSocket(sock, cli, buf, BUFSIZE); - writeUdpSocket(sock, cli, buf, ret); - } - } - - if (strcmp(argv[1], "c") == 0) { - //sock = connectUdpSocket("::1", atoi(argv[2]), PROTO_UDPv6); - sock = connectUdpSocket("127.0.0.1", atoi(argv[2]), PROTO_UDPv4); - - strcpy(buf, "Hello world !\n"); - writeUdpSocket(sock, sock, buf, strlen(buf)); - - memset(buf, 0, BUFSIZE); - readUdpSocket(sock, sock, buf, BUFSIZE); - - printf("buf = %s", buf); - //while(1)sleep(1); - closeUdpSocket(sock); - } - - return 0; + sock_udp_t *sock; + char buf[BUFSIZE]; + int ret; + + if( strcmp(argv[1], "s") == 0 ) + { + sock_udp_t *cli; + + //sock = bindUdpSocket("::1", atoi(argv[2]), PROTO_UDPv6 ); + sock = bindUdpSocket("127.0.0.1", atoi(argv[2]), PROTO_UDPv4 ); + + //cli = newSockUdp(PROTO_UDPv6); + cli = newSockUdp(PROTO_UDPv4); + + while(1) + { + while( myWait(sock) == 0 ) + ; + + memset(buf, 0, BUFSIZE); + ret = readUdpSocket(sock, cli, buf, BUFSIZE); + writeUdpSocket(sock, cli, buf, ret); + } + } + + if( strcmp(argv[1], "c") == 0 ) + { + //sock = connectUdpSocket("::1", atoi(argv[2]), PROTO_UDPv6); + sock = connectUdpSocket("127.0.0.1", atoi(argv[2]), PROTO_UDPv4); + + strcpy(buf, "Hello world !\n"); + writeUdpSocket(sock, sock, buf, strlen(buf)); + + memset(buf, 0, BUFSIZE); + readUdpSocket(sock, sock, buf, BUFSIZE); + + printf("buf = %s", buf); + //while(1)sleep(1); + closeUdpSocket(sock); + } + + return 0; } #endif + -- cgit v1.2.3