summaryrefslogtreecommitdiff
path: root/src/libstddjb/socket_conn4.c
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2017-02-21 12:05:07 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2017-02-21 12:05:07 +0000
commit49d8fa1058aaf23c29e074b2314492ae40d2f557 (patch)
tree393f884d5a99f984e992a0f35f1b02ac43536217 /src/libstddjb/socket_conn4.c
parentfdffefb8032922ce7ffe4c00816072a8ff2148fc (diff)
downloadskalibs-49d8fa1058aaf23c29e074b2314492ae40d2f557.tar.xz
Types change: big pass on libstddjb and libunixonacid
libdatastruct still missing, library still not functional
Diffstat (limited to 'src/libstddjb/socket_conn4.c')
-rw-r--r--src/libstddjb/socket_conn4.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/libstddjb/socket_conn4.c b/src/libstddjb/socket_conn4.c
index 12459a8..78a10b9 100644
--- a/src/libstddjb/socket_conn4.c
+++ b/src/libstddjb/socket_conn4.c
@@ -3,20 +3,21 @@
#include <skalibs/nonposix.h>
#include <sys/socket.h>
#include <netinet/in.h>
+#include <stdint.h>
+#include <string.h>
#include <errno.h>
#include <skalibs/uint16.h>
-#include <skalibs/bytestr.h>
#include <skalibs/socket.h>
-int socket_connect4 (int s, char const *ip, uint16 port)
+int socket_connect4 (int s, char const *ip, uint16_t port)
{
struct sockaddr_in sa ;
- register int r ;
- byte_zero(&sa, sizeof sa) ;
+ int r ;
+ memset(&sa, 0, sizeof sa) ;
sa.sin_family = AF_INET ;
uint16_big_endian((char *)&port, 1) ;
sa.sin_port = port ;
- byte_copy((char *)&sa.sin_addr.s_addr, 4, ip) ;
+ memcpy(&sa.sin_addr.s_addr, ip, 4) ;
do r = connect(s, (struct sockaddr *)&sa, sizeof sa) ;
while ((r == -1) && (errno == EINTR)) ;
if ((r == -1) && (errno == EALREADY)) errno = EINPROGRESS ;