diff --git a/src/net.c b/src/net.c index 57a1f00..c716848 100644 --- a/src/net.c +++ b/src/net.c @@ -16,7 +16,6 @@ int net_client_init(net_t *const n, const int af_family, const char *const raddr n->raddr.sin_family = af_family; n->raddr.sin_addr.s_addr = inet_addr(raddr); n->raddr.sin_port = htons(rport); - return 0; } @@ -50,11 +49,9 @@ void net_destroy(net_t *n) { memset(&n->raddr, 0, sizeof(n->raddr)); n->raddr_len = sizeof(n->raddr); memset(&n->laddr, 0, sizeof(n->laddr)); - - memset(&n->buffer, 0, NET_BUFLEN); } -int net_sendto(net_t *const n, const char *const buf, const int buf_len) { +int net_send(net_t *const n, const char *const buf, const int buf_len) { if (n->fd == -1) return -1; @@ -64,11 +61,11 @@ int net_sendto(net_t *const n, const char *const buf, const int buf_len) { return 0; } -int net_recvfrom(net_t *const n) { +int net_recv(net_t *const n, void *buf, size_t buf_len) { if (n->fd == -1 || n->raddr.sin_addr.s_addr == 0) return -1; - if ((recvfrom(n->fd, n->buffer, NET_BUFLEN, 0, (struct sockaddr *)&n->inaddr, &n->inaddr_len)) == -1) + if ((recvfrom(n->fd, buf, buf_len, 0, (struct sockaddr *)&n->inaddr, &n->inaddr_len)) == -1) return -1; if (n->raddr.sin_addr.s_addr != n->inaddr.sin_addr.s_addr) { diff --git a/src/net.h b/src/net.h index c15b8c1..39c4232 100644 --- a/src/net.h +++ b/src/net.h @@ -4,21 +4,17 @@ #include #include -#define NET_BUFLEN 256 - typedef struct net_t { int fd; struct sockaddr_in laddr, raddr, inaddr; socklen_t raddr_len, inaddr_len; - - char buffer[NET_BUFLEN]; } net_t; int net_client_init(net_t *const n, const int af_family, const char *const raddr, const int rport); int net_server_init(net_t *const n, const int af_family, const char *const laddr, const int lport); void net_destroy(net_t *n); -int net_sendto(net_t *const n, const char *const buf, const int buf_len); -int net_recvfrom(net_t *const n); +int net_send(net_t *const n, const char *const buf, const int buf_len); +int net_recv(net_t *const n, void *buf, size_t buf_len); #endif /* _NET_H_ */ \ No newline at end of file