cleaned up listen error code handling

diff --git a/.gitignore b/.gitignore
index 26fa21f12f10e874b1d98db051eb806dd1c25cd7..9c35be07ae330765665f598bdeb6e9c4adb8c445 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 build/
 build.bin
+tags

diff --git a/bin/dial.c b/bin/dial.c
index cbfdb1c54dad327ce77458d25d3268bcbaddbe3c..678ec59b2faeab8c86756617a49e8cece4f30981 100644 (file)
--- a/bin/dial.c
+++ b/bin/dial.c
@@ -1,3 +1,6 @@
+#include <liba.h>
+#include <libnet.h>
+
 int main(int argc, char** argv)
 {
     (void)argc;

diff --git a/bin/listen.c b/bin/listen.c
index be58c80851e702d1a8fbd9ec5d19d82d26b86599..fddd67381bd0c7ff7e7877446bed30febd000eb1 100644 (file)
--- a/bin/listen.c
+++ b/bin/listen.c
@@ -5,17 +5,17 @@
 
 void serve(int cfd, char** argv)
 {
-    switch (fork())
+    int pid = fork();
+    if (pid < 0)
     {
-        case -1:
-            perror("fork");
-            break;
-        case 0:
-            dup2(cfd, 0); dup2(cfd, 1); dup2(cfd, 2);
-            exit(execvp(argv[0], argv));
-            break;
-        default:
-            break;
+        perror("fork");
+    }
+    else if (pid == 0)
+    {
+        dup2(cfd, 0);
+        dup2(cfd, 1);
+        dup2(cfd, 2);
+        exit(execvp(argv[0], argv));
     }
     close(cfd);
 }

diff --git a/lib/net/netdial.c b/lib/net/netdial.c
new file mode 100644 (file)
index 0000000..e9544e2
--- /dev/null
+++ b/lib/net/netdial.c
@@ -0,0 +1,22 @@
+#include <liba.h>
+#include <libnet.h>
+
+//int netdial(char* dialstr)
+//{
+//    struct socket_t sock = { .fd = -1 };
+//    if (netsocket(dialstr, &sock))
+//    {
+//        int rv = -1;
+//        switch (sock.addr.in.sin_family)
+//        {
+//            case AF_INET:
+//                rv = bind(sock.fd, (struct sockaddr*)&sock.addr.in, sizeof(sock.addr.in));
+//                break;
+//
+//            case AF_UNIX:
+//                if (connect(sock.fd, (struct sockaddr*)&sock.addr.un, sizeof(sock.addr.un)) < 0)
+//                {
+//                    unlink(sock.addr.un.sun_path);
+//                    rv = bind(sock.fd, (struct sockaddr*)&sock.addr.un, sizeof(sock.addr.un));
+//                }
+//                break;