initial bind support

Author: intika

README.md

@@ -67,6 +67,7 @@ Changelog:
 
 - Block non tcp packet on send()
 - Prevent bypass noleak
+- Add support for bind() to block listen on unsupported protocol 
 
 **Version 5.40:**
 

src/core.h

@@ -123,10 +123,12 @@ extern gethostbyaddr_t true_gethostbyaddr;
 typedef ssize_t (*send_t)(int, const void *, size_t, int);
 typedef ssize_t (*sendto_t)(int, const void *, size_t, int, const struct sockaddr, socklen_t);
 typedef ssize_t (*sendmsg_t)(int, const struct msghdr *, int);
+typedef int (*bind_t)(int, const struct sockaddr, socklen_t);
 
 extern send_t true_send;
 extern sendto_t true_sendto;
 extern sendmsg_t true_sendmsg;
+extern bind_t true_bind;
 
 struct gethostbyname_data {
 	struct hostent hostent_space;

src/libproxybound.c

@@ -55,6 +55,7 @@ gethostbyaddr_t true_gethostbyaddr;
 send_t true_send;
 sendto_t true_sendto;
 sendmsg_t true_sendmsg;
+bind_t true_bind;
 
 int tcp_read_time_out;
 int tcp_connect_time_out;
@@ -479,45 +480,9 @@ int connect(int sock, const struct sockaddr *addr, socklen_t len) {
 	return ret;
 }
 
-ssize_t send(int sockfd, const void *buf, size_t len, int flags) {
-    //The send() call may be used only when the socket is in a connected state (so that the intended recipient is known)
-    //To avoid any hack this is watched for leak too
-    
-    /* If the real connect doesn't exist, we're stuffed */
-    if (true_send == NULL) {
-        PDEBUG("unresolved symbol: send\n\n");
-        return -1;        
-    }
-    
-    //return true_send(sockfd, buf, len, flags);
-    if (proxybound_allow_leak) {
-        PDEBUG("send: got send request\n");
-        PDEBUG("allowing direct send()\n\n"); 
-        return true_send(sockfd, buf, len, flags);
-        //Already handled in connect ? 
-        //TODO deeper handling (socktype)
-    } else {
-        int sock_type = -1;
-        unsigned int sock_type_len = sizeof(sock_type);
-
-        /* Get the type of the socket */
-        getsockopt(sockfd, SOL_SOCKET, SO_TYPE, (void *) &sock_type, &sock_type_len);
-        
-        if (sock_type != SOCK_STREAM) {
-            //SOCK_STREAM
-            //SOCK_DGRAM
-            //SOCK_SEQPACKET
-            //SOCK_RAW
-            //SOCK_RDM
-            //SOCK_PACKET
-            PDEBUG("send: blocking send request type SOCK_DGRAM/SOCK_SEQPACKET/SOCK_RAW/SOCK_RDM/SOCK_PACKET\n\n");
-            return -1;
-            //TODO may block dns here
-        } else {
-            return true_send(sockfd, buf, len, flags);
-        }
-        return -1;
-    }
+int bind(int sockfd, const struct sockaddr *addr, socklen_t addrlen) {
+    PDEBUG("bind: got a bind request\n\n");
+    return true_bind(sockfd, *addr, addrlen);
 }
 
 ssize_t sendto(int sockfd, const void *buf, size_t len, int flags, const struct sockaddr *dest_addr, socklen_t addrlen) {  
@@ -581,6 +546,47 @@ ssize_t sendto(int sockfd, const void *buf, size_t len, int flags, const struct
     return -1;
 }
 
+ssize_t send(int sockfd, const void *buf, size_t len, int flags) {
+    //The send() call may be used only when the socket is in a connected state (so that the intended recipient is known)
+    //To avoid any hack this is watched for leak too
+    
+    /* If the real connect doesn't exist, we're stuffed */
+    if (true_send == NULL) {
+        PDEBUG("unresolved symbol: send\n\n");
+        return -1;        
+    }
+    
+    //return true_send(sockfd, buf, len, flags);
+    if (proxybound_allow_leak) {
+        PDEBUG("send: got send request\n");
+        PDEBUG("allowing direct send()\n\n"); 
+        return true_send(sockfd, buf, len, flags);
+        //Already handled in connect ? 
+        //TODO deeper handling (socktype)
+    } else {
+        int sock_type = -1;
+        unsigned int sock_type_len = sizeof(sock_type);
+
+        /* Get the type of the socket */
+        getsockopt(sockfd, SOL_SOCKET, SO_TYPE, (void *) &sock_type, &sock_type_len);
+        
+        if (sock_type != SOCK_STREAM) {
+            //SOCK_STREAM
+            //SOCK_DGRAM
+            //SOCK_SEQPACKET
+            //SOCK_RAW
+            //SOCK_RDM
+            //SOCK_PACKET
+            PDEBUG("send: blocking send request type SOCK_DGRAM/SOCK_SEQPACKET/SOCK_RAW/SOCK_RDM/SOCK_PACKET\n\n");
+            return -1;
+            //TODO may block dns here
+        } else {
+            return true_send(sockfd, buf, len, flags);
+        }
+        return -1;
+    }
+}
+    
 ssize_t sendmsg(int sockfd, const struct msghdr *msg, int flags) {
 
     struct sockaddr_in *connaddr;

src/main.c

@@ -26,7 +26,7 @@
 #include "common.h"
 
 
-static char appVersion[5] = "5.40\n";
+static char appVersion[5] = "5.50\n";
 
 static const char *dll_name = DLL_NAME;
 static pid_t child_pid = -1 ;