fixed errors in sockets

examples/clientserver.c

@@ -225,9 +225,11 @@ int main(int argc, char **argv){
     if(G.isserver){
         //sl_sock_keyno_init(&kph_number); // don't forget to init first or use macro in initialisation
         s = sl_sock_run_server(type, G.node, -1, handlers);
+        DBG("Server started");
     } else {
         sl_setup_con();
         s = sl_sock_run_client(type, G.node, -1);
+        DBG("Client started");
     }
     if(!s) ERRX("Can't create socket and/or run threads");
     if(G.isserver){

socket.c

@@ -81,17 +81,24 @@ const char *sl_sock_hresult2str(sl_sock_hresult_e r){
 }
 
 // convert UNIX socket name for unaddr; result should be free'd
-static char *convunsname(const char *path){
+static char *convunsname(const char *path, socklen_t *nbytes){
-    char *apath = MALLOC(char, 106);
+    char *apath = MALLOC(char, UNIX_SOCK_PATH_MAX);
+    socklen_t len = 0;
     if(*path == 0){
         DBG("convert name starting from 0");
         apath[0] = 0;
-        strncpy(apath+1, path+1, 104);
+        strncpy(apath+1, path+1, UNIX_SOCK_PATH_MAX-2);
+        len = 1 + strlen(path+1);
     }else if(strncmp("\\0", path, 2) == 0){
         DBG("convert name starting from \\0");
         apath[0] = 0;
-        strncpy(apath+1, path+2, 104);
+        strncpy(apath+1, path+2, UNIX_SOCK_PATH_MAX-2);
-    }else strncpy(apath, path, 105);
+        len = 1 + strlen(path+2);
+    }else{
+        strncpy(apath, path, UNIX_SOCK_PATH_MAX-1);
+        len = strlen(path);
+    }
+    if(nbytes) *nbytes = len + sizeof(sa_family_t); // amount of bytes for `bind()` (parameter `len`)
     return apath;
 }
 
@@ -358,7 +365,7 @@ static sl_sock_hresult_e msgparser(sl_sock_t *client, char *str){
     int keylen = strlen(key);
     char *numstart = NULL;
     const char *bra = "([{", *ket = ")]}";
-    char *found = strchr(ket, key[keylen - 1]);
+    char *found = strchr((char*)ket, key[keylen - 1]);
     DBG("found=%s", found);
     if(found){
         char *keyend = strchr(key, bra[found - ket]); // find starting bracket
@@ -637,28 +644,35 @@ errex:
  */
 static sl_sock_t *sl_sock_open(sl_socktype_e type, const char *path, sl_sock_hitem_t *handlers, int bufsiz, int isserver){
     if(!path || type >= SOCKT_AMOUNT) return NULL;
+    printf("OPen\n");
+    FNAME();
     if(bufsiz < 256) bufsiz = 256;
     int sock = -1;
     struct addrinfo ai = {0}, *res = &ai;
     struct sockaddr_un unaddr = {0};
-    char *str = NULL;
     ai.ai_socktype = SOCK_STREAM;
     switch(type){
         case SOCKT_UNIX:
-            str = convunsname(path);
+        DBG("SOCKT_UNIX");
+            {
+            char *str = convunsname(path, &ai.ai_addrlen);
+            DBG("path+1: %s", str+1);
             if(!str) return NULL;
             unaddr.sun_family = AF_UNIX;
             ai.ai_addr = (struct sockaddr*) &unaddr;
-            ai.ai_addrlen = sizeof(unaddr);
+            memcpy(unaddr.sun_path, str, UNIX_SOCK_PATH_MAX);
-            memcpy(unaddr.sun_path, str, 106);
+            FREE(str); // don't forget!
             ai.ai_family = AF_UNIX;
             //ai.ai_socktype = SOCK_SEQPACKET;
+            }
         break;
         case SOCKT_NET:
         case SOCKT_NETLOCAL:
-            //ai.ai_socktype = SOCK_DGRAM; // = SOCK_STREAM;
+            if(isserver){
-            ai.ai_family = AF_INET;
+                ai.ai_flags = AI_PASSIVE;
-            if(isserver) ai.ai_flags = AI_PASSIVE;
+                //ai.ai_family = AF_INET;
+            }// else
+                ai.ai_family = AF_UNSPEC; // not AF_INET for client as there maybe problems with IPv6
         break;
         default: // never reached
             WARNX(_("Unsupported socket type %d"), type);
@@ -675,9 +689,9 @@ static sl_sock_t *sl_sock_open(sl_socktype_e type, const char *path, sl_sock_hit
         sl_sock_delete(&s);
         return NULL;
     }else{ // fill node/service
-        if(type == SOCKT_UNIX) s->node = strdup(str); // str now is converted path
+        if(type == SOCKT_UNIX) s->node = strdup(path); // str now is path copy
         else{
-            char *delim = strchr(path, ':');
+            char *delim = strchr((char*)path, ':');
             if(!delim) s->service = strdup(path); // only port
             else{
                 if(delim == path) s->service = strdup(path+1);
@@ -716,7 +730,7 @@ static sl_sock_t *sl_sock_open(sl_socktype_e type, const char *path, sl_sock_hit
     }
     for(struct addrinfo *p = res; p; p = p->ai_next){
         if((sock = socket(p->ai_family, p->ai_socktype, p->ai_protocol)) < 0) continue;
-        DBG("Try proto %d, type %d", p->ai_protocol, p->ai_socktype);
+        DBG("Try proto %d, type %d, socktype %d", p->ai_protocol, p->ai_socktype, p->ai_socktype);
         if(isserver){
             int reuseaddr = 1;
             if(setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &reuseaddr, sizeof(int)) == -1){
@@ -737,10 +751,12 @@ static sl_sock_t *sl_sock_open(sl_socktype_e type, const char *path, sl_sock_hit
             if(connect(sock, p->ai_addr, p->ai_addrlen) == -1){
                 WARN("connect()");
                 close(sock); sock = -1;
+                continue;
             }
         }
         break;
     }
+    if(type != SOCKT_UNIX) freeaddrinfo(res); // don't forget to free memory allocated with getaddrinfo
     if(sock < 0) sl_sock_delete(&s);
     else{
         s->fd = sock;

usefull_macros.h

@@ -418,6 +418,8 @@ size_t sl_RB_writestr(sl_ringbuffer_t *b, char *s);
 /******************************************************************************\
                          The original socket.h
 \******************************************************************************/
+// max length (including trailing '\0') of UNIX socket path
+#define UNIX_SOCK_PATH_MAX 108
 
 // handler result: what to send to client
 typedef enum{
@@ -448,7 +450,7 @@ typedef struct{
 
 // optional keyword number like key[12] = 500
 typedef struct{
-    double magick;  // Inf - to distinguish it from sl_sock_*_t
+    double magick;  // -Inf - to distinguish it from sl_sock_*_t
     int n;          // if n < 0 there was no any number in `key`
 } sl_sock_keyno_t;
 #define SL_SOCK_KEYNO_DEFAULT       (sl_sock_keyno_t){.magick = -INFINITY, .n = -1}
@@ -478,6 +480,9 @@ typedef enum{
 
 struct sl_sock;
 
+// opent socket and return its file descriptor
+int sl_sock_getfd(sl_socktype_e type, const char *path);
+
 // default max clients amount
 #define SL_DEF_MAXCLIENTS   (32)
 // custom socket handlers: connect/disconnect/etc
@@ -545,4 +550,3 @@ int sl_sock_sendall(sl_sock_t *sock, uint8_t *data, size_t len);
 sl_sock_hresult_e sl_sock_inthandler(sl_sock_t *client, sl_sock_hitem_t *hitem, const char *str);
 sl_sock_hresult_e sl_sock_dblhandler(sl_sock_t *client, sl_sock_hitem_t *hitem, const char *str);
 sl_sock_hresult_e sl_sock_strhandler(sl_sock_t *client, sl_sock_hitem_t *hitem, const char *str);
-