Test net module in main.

Makefile

@@ -12,7 +12,7 @@ OBJ_DIR := obj
 SRCs := $(wildcard $(SRC_DIR)/*.c)
 OBJs := $(SRCs:$(SRC_DIR)/%.c=$(OBJ_DIR)/%.o)
 
-CFLAGS = --std=c99 -O3 -Wall -Werror -Wextra -pedantic
+CFLAGS = --std=c99 -D_POSIX_C_SOURCE=200112L -O3 -Wall -Werror -Wextra -pedantic
 LDFLAGS += -lportaudio -lopus -lsodium
 
 $(TARGET): $(OBJs)
@@ -25,5 +25,5 @@ $(OBJ_DIR):
 	mkdir -p $@
 
 clean:
-	rm ${TARGET}
-	rm obj/*.o
+	rm -f ${TARGET}
+	rm -f obj/*.o

src/main.c

@@ -3,6 +3,7 @@
 
 #include "audio.h"
 #include "crypt.h"
+#include "net.h"
 
 #define CHANNELS 1
 #define SAMPLE_RATE 48000
@@ -96,6 +97,19 @@ int main(int argc, char **argv) {
     if (strcmp(msg, rmsg) != 0)
         fprintf(stderr, "Yikes!");
 
+    net_t nc, ns;
+
+    if (net_client_init(&nc, "127.0.0.1", "14816") == -1) {
+        rt = -1;
+        goto cleanup;
+    }
+
+    if (net_server_init(&ns, "127.0.0.1", "14816") == -1) {
+        rt = -1;
+        goto cleanup;
+    }
+
+
     audio_t aud;
 
     unsigned char buf[BUF_SIZE];
@@ -107,9 +121,12 @@ int main(int argc, char **argv) {
     unsigned long long cl = 0, ml = 0;
 
     printf("Listening... ");
-    for (int i = 0; i < (2 * SAMPLE_RATE)/FRAMES_PER_BUFFFER; ++i) {
+    for (int i = 0; i < (20 * SAMPLE_RATE)/FRAMES_PER_BUFFFER; ++i) {
         audio_read(&aud, buf, BUF_SIZE);
         c = crypt_session_encrypt(&os, buf, BUF_SIZE, &cl);
+        int sc = net_send(&nc, (const char *)c, cl);
+        int rc = net_recv(&ns, c, cl);
+        fprintf(stderr, "%d %d\n", sc, rc);
         m = crypt_session_decrypt(&rs, c, cl, &ml);
         audio_write(&aud, m, ml);
         free(c); free(m);
@@ -134,5 +151,8 @@ cleanup:
     crypt_session_destroy(&os);
     crypt_session_destroy(&rs);
 
+    net_destroy(&ns);
+    net_destroy(&nc);
+
     return rt;
 }

src/net.c

@@ -2,76 +2,108 @@
 
 #include <string.h>
 #include <unistd.h>
+#include <netdb.h>
 
-#include <arpa/inet.h>
+int net_client_init(net_t *const n, const char *const raddr, const char *const rport) {
+    struct addrinfo hints, *ri, *cri;
 
-int net_client_init(net_t *const n, const int af_family, const char *const raddr, const int rport) {
-    if ((n->fd = socket(af_family, SOCK_DGRAM, 0)) == -1 )
+    memset(&hints, 0, sizeof(hints));
+    hints.ai_family = AF_UNSPEC;
+    hints.ai_socktype = SOCK_DGRAM;
+
+    if (getaddrinfo(raddr, rport, &hints, &ri) != 0)
         return -1;
 
-    memset(&n->inaddr, 0, sizeof(n->inaddr));
-    n->inaddr_len = sizeof(n->inaddr);
+    for (cri = ri; cri != NULL; cri = cri->ai_next) {
+        if ((n->fd = socket(cri->ai_family, cri->ai_socktype, cri->ai_protocol)) == -1)
+            continue;
 
-    memset(&n->raddr, 0, sizeof(n->raddr));
-    n->raddr.sin_family = af_family;
-    n->raddr.sin_addr.s_addr = inet_addr(raddr);
-    n->raddr.sin_port = htons(rport);
-    return 0;
-}
+        break;
+    }
 
-int net_server_init(net_t *const n, const int af_family, const char *const laddr, const int lport) {
-    if ((n->fd = socket(af_family, SOCK_DGRAM, 0)) == -1 )
+    if (cri == NULL) {
+        freeaddrinfo(ri);
         return -1;
+    }
 
     memset(&n->inaddr, 0, sizeof(n->inaddr));
     n->inaddr_len = sizeof(n->inaddr);
 
     memset(&n->laddr, 0, sizeof(n->laddr));
-    n->laddr.sin_family = af_family;
-    n->laddr.sin_addr.s_addr = inet_addr(laddr);
-    n->laddr.sin_port = htons(lport);
 
     memset(&n->raddr, 0, sizeof(n->raddr));
-    n->raddr_len = sizeof(n->raddr);
+    memcpy(&n->raddr, cri->ai_addr, sizeof(n->raddr));
 
-    if (bind(n->fd, (struct sockaddr *)&n->laddr, sizeof(n->laddr)) == -1)
+    freeaddrinfo(ri);
+
+    return 0;
+}
+
+int net_server_init(net_t *const n, const char *const laddr, const char *const lport) {
+    struct addrinfo hints, *li, *cli;
+    int reuseaddr = 1;
+
+    memset(&hints, 0, sizeof(hints));
+    hints.ai_family = AF_UNSPEC;
+    hints.ai_socktype = SOCK_DGRAM;
+    hints.ai_flags = AI_PASSIVE;
+
+    if (getaddrinfo(laddr, lport, &hints, &li) != 0)
         return -1;
 
+    for (cli = li; cli != NULL; cli = cli->ai_next) {
+        if ((n->fd = socket(cli->ai_family, cli->ai_socktype, cli->ai_protocol)) == -1)
+            continue;
+
+        if (setsockopt(n->fd, SOL_SOCKET, SO_REUSEADDR, &reuseaddr, sizeof(reuseaddr)) == -1) {
+            close(n->fd);
+            continue;
+        }
+
+        if (bind(n->fd, cli->ai_addr, cli->ai_addrlen) == -1) {
+            close(n->fd);
+            continue;
+        }
+
+        break;
+    }
+
+    memset(&n->inaddr, 0, sizeof(n->inaddr));
+    n->inaddr_len = 0;
+
+    memset(&n->raddr, 0, sizeof(n->raddr));
+
+    memset(&n->laddr, 0, sizeof(n->laddr));
+    memcpy(&n->laddr, cli->ai_addr, sizeof(n->raddr));
+
+    freeaddrinfo(li);
+
     return 0;
 }
 
 void net_destroy(net_t *n) {
-    if (n->fd > 0) {
+    if (n->fd != -1) {
         close(n->fd);
         n->fd = -1;
     }
 
     memset(&n->raddr, 0, sizeof(n->raddr));
-    n->raddr_len = sizeof(n->raddr);
+    n->raddr_len = 0;
     memset(&n->laddr, 0, sizeof(n->laddr));
+    memset(&n->inaddr, 0, sizeof(n->inaddr));
+    n->inaddr_len = 0;
 }
 
-int net_send(net_t *const n, const char *const buf, const int buf_len) {
-    if (n->fd == -1 || n->raddr.sin_addr.s_addr == 0)
+ssize_t net_send(net_t *const n, const char *const buf, int buf_len) {
+    if (n->fd == -1 || n->raddr.sa_family == AF_UNSPEC)
         return -1;
 
-    if (sendto(n->fd, buf, buf_len, 0, (struct sockaddr *)&n->raddr, sizeof(n->raddr)) == -1)
-        return -1;
-
-    return 0;
+    return sendto(n->fd, buf, buf_len, 0, &n->raddr, sizeof(n->raddr));
 }
 
-int net_recv(net_t *const n, void *buf, size_t buf_len) {
-    if (n->fd == -1 || n->raddr.sin_addr.s_addr == 0)
+ssize_t net_recv(net_t *const n, void *const buf, size_t buf_len) {
+    if (n->fd == -1)
         return -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) {
-        /* Incoming packet doesn't originate from the one we are talking to. Drop it. */
-        return 0;
-    }
-
-    return 0;
+    return recvfrom(n->fd, buf, buf_len, 0, &n->inaddr, &n->inaddr_len);
 }

src/net.h

@@ -1,20 +1,19 @@
 #ifndef _NET_H_
 #define _NET_H_
 
-#include <sys/socket.h>
 #include <netinet/in.h>
 
 typedef struct net_t {
     int fd;
-    struct sockaddr_in laddr, raddr, inaddr;
+    struct sockaddr laddr, raddr, inaddr;
     socklen_t raddr_len, inaddr_len;
 } 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);
+int net_client_init(net_t *const n, const char *const raddr, const char *const rport);
+int net_server_init(net_t *const n, const char *const laddr, const char *const lport);
 void net_destroy(net_t *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);
+ssize_t net_send(net_t *const n, const char *const buf, int buf_len);
+ssize_t net_recv(net_t *const n, void *const buf, size_t buf_len);
 
 #endif /* _NET_H_ */