2 Commits

Author SHA1 Message Date
b5d5396167 fixed for "-pedantic-errors" 2026-03-04 09:10:56 +03:00
b20e669d93 fixed errors in sockets 2026-03-02 17:53:19 +03:00
8 changed files with 138 additions and 106 deletions

View File

@@ -8,7 +8,7 @@ set(VERSION "${MAJOR_VERSION}.${MID_VERSION}.${MINOR_VERSION}")
project(${PROJ} VERSION ${VERSION} LANGUAGES C) project(${PROJ} VERSION ${VERSION} LANGUAGES C)
# default flags # default flags
set(CMAKE_C_FLAGS "${CFLAGS} -O2") set(CMAKE_C_FLAGS "${CFLAGS} -O2 -pedantic-errors")
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS}") set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS}")
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS} -Wextra -Wall -Werror -W") set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS} -Wextra -Wall -Werror -W")
set(CMAKE_COLOR_MAKEFILE ON) set(CMAKE_COLOR_MAKEFILE ON)

View File

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

View File

@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-11-06 15:03+0300\n" "POT-Creation-Date: 2026-03-04 09:05+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -77,79 +77,79 @@ msgstr ""
msgid "Can't use multiple args with arg_none!" msgid "Can't use multiple args with arg_none!"
msgstr "" msgstr ""
#: /home/eddy/Docs/SAO/C_diff/snippets_library/parseargs.c:267 #: /home/eddy/Docs/SAO/C_diff/snippets_library/parseargs.c:268
#, c-format #, c-format
msgid "double long arguments: --%s" msgid "double long arguments: --%s"
msgstr "" msgstr ""
#: /home/eddy/Docs/SAO/C_diff/snippets_library/parseargs.c:273 #: /home/eddy/Docs/SAO/C_diff/snippets_library/parseargs.c:274
#, c-format #, c-format
msgid "double short arguments: -%c" msgid "double short arguments: -%c"
msgstr "" msgstr ""
#: /home/eddy/Docs/SAO/C_diff/snippets_library/parseargs.c:343 #: /home/eddy/Docs/SAO/C_diff/snippets_library/parseargs.c:347
#, c-format #, c-format
msgid "Need argument with %s type\n" msgid "Need argument with %s type\n"
msgstr "" msgstr ""
#. print only one message #. print only one message
#: /home/eddy/Docs/SAO/C_diff/snippets_library/parseargs.c:435 #: /home/eddy/Docs/SAO/C_diff/snippets_library/parseargs.c:439
msgid "sl_showhelp(): option index out of range" msgid "sl_showhelp(): option index out of range"
msgstr "" msgstr ""
#: /home/eddy/Docs/SAO/C_diff/snippets_library/parseargs.c:441 #: /home/eddy/Docs/SAO/C_diff/snippets_library/parseargs.c:445
#, c-format #, c-format
msgid "Usage: %s [arguments]\n" msgid "Usage: %s [arguments]\n"
msgstr "" msgstr ""
#: /home/eddy/Docs/SAO/C_diff/snippets_library/parseargs.c:528 #: /home/eddy/Docs/SAO/C_diff/snippets_library/parseargs.c:535
#, c-format #, c-format
msgid "Wrong parameter: %s" msgid "Wrong parameter: %s"
msgstr "" msgstr ""
#: /home/eddy/Docs/SAO/C_diff/snippets_library/parseargs.c:532 #: /home/eddy/Docs/SAO/C_diff/snippets_library/parseargs.c:539
#, c-format #, c-format
msgid "%s: need argument!" msgid "%s: need argument!"
msgstr "" msgstr ""
#: /home/eddy/Docs/SAO/C_diff/snippets_library/parseargs.c:536 #: /home/eddy/Docs/SAO/C_diff/snippets_library/parseargs.c:543
#, c-format #, c-format
msgid "Wrong argument \"%s\" of parameter \"%s\"" msgid "Wrong argument \"%s\" of parameter \"%s\""
msgstr "" msgstr ""
#: /home/eddy/Docs/SAO/C_diff/snippets_library/socket.c:147 #: /home/eddy/Docs/SAO/C_diff/snippets_library/socket.c:154
msgid "Server disconnected" msgid "Server disconnected"
msgstr "" msgstr ""
#: /home/eddy/Docs/SAO/C_diff/snippets_library/socket.c:434 #: /home/eddy/Docs/SAO/C_diff/snippets_library/socket.c:441
msgid "Can't start server handlers thread" msgid "Can't start server handlers thread"
msgstr "" msgstr ""
#: /home/eddy/Docs/SAO/C_diff/snippets_library/socket.c:503 #: /home/eddy/Docs/SAO/C_diff/snippets_library/socket.c:513
msgid "Limit of connections reached" msgid "Limit of connections reached"
msgstr "" msgstr ""
#. check for RB overflow #. check for RB overflow
#. -1 - buffer empty (can't be), -2 - buffer overflow #. -1 - buffer empty (can't be), -2 - buffer overflow
#: /home/eddy/Docs/SAO/C_diff/snippets_library/socket.c:547 #: /home/eddy/Docs/SAO/C_diff/snippets_library/socket.c:557
#: /home/eddy/Docs/SAO/C_diff/snippets_library/socket.c:548 #: /home/eddy/Docs/SAO/C_diff/snippets_library/socket.c:558
#, c-format #, c-format
msgid "Server thread: ring buffer overflow for fd=%d" msgid "Server thread: ring buffer overflow for fd=%d"
msgstr "" msgstr ""
#: /home/eddy/Docs/SAO/C_diff/snippets_library/socket.c:562 #: /home/eddy/Docs/SAO/C_diff/snippets_library/socket.c:572
#, c-format #, c-format
msgid "Server thread: can't write data to ringbuffer: overflow from fd=%d" msgid "Server thread: can't write data to ringbuffer: overflow from fd=%d"
msgstr "" msgstr ""
#. buffer overflow #. buffer overflow
#: /home/eddy/Docs/SAO/C_diff/snippets_library/socket.c:574 #: /home/eddy/Docs/SAO/C_diff/snippets_library/socket.c:584
#, c-format #, c-format
msgid "Server thread: buffer overflow from fd=%d" msgid "Server thread: buffer overflow from fd=%d"
msgstr "" msgstr ""
#. never reached #. never reached
#: /home/eddy/Docs/SAO/C_diff/snippets_library/socket.c:664 #: /home/eddy/Docs/SAO/C_diff/snippets_library/socket.c:681
#, c-format #, c-format
msgid "Unsupported socket type %d" msgid "Unsupported socket type %d"
msgstr "" msgstr ""

View File

@@ -7,7 +7,7 @@
msgid "" msgid ""
msgstr "Project-Id-Version: PACKAGE VERSION\n" msgstr "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-11-06 14:57+0300\n" "POT-Creation-Date: 2026-03-04 09:01+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -76,80 +76,80 @@ msgstr "
msgid "Can't use multiple args with arg_none!" msgid "Can't use multiple args with arg_none!"
msgstr "íÁÓÓÉ× ÐÁÒÁÍÅÔÒÏ× ÎÅ ÍÏÖÅÔ ÉÍÅÔØ ÔÉÐ arg_none!" msgstr "íÁÓÓÉ× ÐÁÒÁÍÅÔÒÏ× ÎÅ ÍÏÖÅÔ ÉÍÅÔØ ÔÉÐ arg_none!"
#: /home/eddy/Docs/SAO/C_diff/snippets_library/parseargs.c:267 #: /home/eddy/Docs/SAO/C_diff/snippets_library/parseargs.c:268
#, c-format #, c-format
msgid "double long arguments: --%s" msgid "double long arguments: --%s"
msgstr "ÄÕÂÌÉÒÕÀÝÉÊÓÑ ÄÌÉÎÎÙÊ ÐÁÒÁÍÅÔÒ: --%s" msgstr "ÄÕÂÌÉÒÕÀÝÉÊÓÑ ÄÌÉÎÎÙÊ ÐÁÒÁÍÅÔÒ: --%s"
#: /home/eddy/Docs/SAO/C_diff/snippets_library/parseargs.c:273 #: /home/eddy/Docs/SAO/C_diff/snippets_library/parseargs.c:274
#, c-format #, c-format
msgid "double short arguments: -%c" msgid "double short arguments: -%c"
msgstr "ÄÕÂÌÉÒÕÀÝÉÊÓÑ ËÏÒÏÔËÉÊ ÐÁÒÁÍÅÔÒ: -%c" msgstr "ÄÕÂÌÉÒÕÀÝÉÊÓÑ ËÏÒÏÔËÉÊ ÐÁÒÁÍÅÔÒ: -%c"
#: /home/eddy/Docs/SAO/C_diff/snippets_library/parseargs.c:343 #: /home/eddy/Docs/SAO/C_diff/snippets_library/parseargs.c:347
#, c-format #, c-format
msgid "Need argument with %s type\n" msgid "Need argument with %s type\n"
msgstr "îÅÏÂÈÏÄÉÍ ÁÒÇÕÍÅÎÔ Ó ÔÉÐÏÍ %s\n" msgstr "îÅÏÂÈÏÄÉÍ ÁÒÇÕÍÅÎÔ Ó ÔÉÐÏÍ %s\n"
#. print only one message #. print only one message
#: /home/eddy/Docs/SAO/C_diff/snippets_library/parseargs.c:435 #: /home/eddy/Docs/SAO/C_diff/snippets_library/parseargs.c:439
msgid "sl_showhelp(): option index out of range" msgid "sl_showhelp(): option index out of range"
msgstr "sl_showhelp(): ÉÎÄÅËÓ ÏÐÃÉÉ ×ÎÅ ÄÏÐÕÓÔÉÍÏÇÏ ÄÉÁÐÁÚÏÎÁ" msgstr "sl_showhelp(): ÉÎÄÅËÓ ÏÐÃÉÉ ×ÎÅ ÄÏÐÕÓÔÉÍÏÇÏ ÄÉÁÐÁÚÏÎÁ"
#: /home/eddy/Docs/SAO/C_diff/snippets_library/parseargs.c:441 #: /home/eddy/Docs/SAO/C_diff/snippets_library/parseargs.c:445
#, c-format #, c-format
msgid "Usage: %s [arguments]\n" msgid "Usage: %s [arguments]\n"
msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ÁÒÇÕÍÅÎÔÙ]\n" msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ÁÒÇÕÍÅÎÔÙ]\n"
#: /home/eddy/Docs/SAO/C_diff/snippets_library/parseargs.c:528 #: /home/eddy/Docs/SAO/C_diff/snippets_library/parseargs.c:535
#, c-format #, c-format
msgid "Wrong parameter: %s" msgid "Wrong parameter: %s"
msgstr "îÅÐÒÁ×ÉÌØÎÙÊ ÐÁÒÁÍÅÔÒ: %s" msgstr "îÅÐÒÁ×ÉÌØÎÙÊ ÐÁÒÁÍÅÔÒ: %s"
#: /home/eddy/Docs/SAO/C_diff/snippets_library/parseargs.c:532 #: /home/eddy/Docs/SAO/C_diff/snippets_library/parseargs.c:539
#, c-format #, c-format
msgid "%s: need argument!" msgid "%s: need argument!"
msgstr "%s: ÎÅÏÂÈÏÄÉÍ ÁÒÇÕÍÅÎÔ!" msgstr "%s: ÎÅÏÂÈÏÄÉÍ ÁÒÇÕÍÅÎÔ!"
#: /home/eddy/Docs/SAO/C_diff/snippets_library/parseargs.c:536 #: /home/eddy/Docs/SAO/C_diff/snippets_library/parseargs.c:543
#, c-format #, c-format
msgid "Wrong argument \"%s\" of parameter \"%s\"" msgid "Wrong argument \"%s\" of parameter \"%s\""
msgstr "îÅÐÒÁ×ÉÌØÎÙÊ ÁÒÇÕÍÅÎÔ \"%s\" ÐÁÒÁÍÅÔÒÁ \"%s\"" msgstr "îÅÐÒÁ×ÉÌØÎÙÊ ÁÒÇÕÍÅÎÔ \"%s\" ÐÁÒÁÍÅÔÒÁ \"%s\""
#: /home/eddy/Docs/SAO/C_diff/snippets_library/socket.c:147 #: /home/eddy/Docs/SAO/C_diff/snippets_library/socket.c:154
msgid "Server disconnected" msgid "Server disconnected"
msgstr "óÅÒ×ÅÒ ÏÔËÌÀÞÅÎ" msgstr "óÅÒ×ÅÒ ÏÔËÌÀÞÅÎ"
#: /home/eddy/Docs/SAO/C_diff/snippets_library/socket.c:434 #: /home/eddy/Docs/SAO/C_diff/snippets_library/socket.c:441
msgid "Can't start server handlers thread" msgid "Can't start server handlers thread"
msgstr "îÅ ÍÏÇÕ ÚÁÐÕÓÔÉÔØ ÐÏÔÏË-ÏÂÒÁÂÏÔÞÉË ÓÅÒ×ÅÒÁ" msgstr "îÅ ÍÏÇÕ ÚÁÐÕÓÔÉÔØ ÐÏÔÏË-ÏÂÒÁÂÏÔÞÉË ÓÅÒ×ÅÒÁ"
#: /home/eddy/Docs/SAO/C_diff/snippets_library/socket.c:503 #: /home/eddy/Docs/SAO/C_diff/snippets_library/socket.c:513
msgid "Limit of connections reached" msgid "Limit of connections reached"
msgstr "äÏÓÔÉÇÎÕÔ ÐÒÅÄÅÌ ÓÏÅÄÉÎÅÎÉÊ" msgstr "äÏÓÔÉÇÎÕÔ ÐÒÅÄÅÌ ÓÏÅÄÉÎÅÎÉÊ"
#. check for RB overflow #. check for RB overflow
#. -1 - buffer empty (can't be), -2 - buffer overflow #. -1 - buffer empty (can't be), -2 - buffer overflow
#: /home/eddy/Docs/SAO/C_diff/snippets_library/socket.c:547 #: /home/eddy/Docs/SAO/C_diff/snippets_library/socket.c:557
#: /home/eddy/Docs/SAO/C_diff/snippets_library/socket.c:548 #: /home/eddy/Docs/SAO/C_diff/snippets_library/socket.c:558
#, c-format #, c-format
msgid "Server thread: ring buffer overflow for fd=%d" msgid "Server thread: ring buffer overflow for fd=%d"
msgstr "ðÏÔÏË ÓÅÒ×ÅÒÁ: ÐÅÒÅÐÏÌÎÅÎÉÅ ÂÕÆÅÒÁ ÏÔ fd=%d" msgstr "ðÏÔÏË ÓÅÒ×ÅÒÁ: ÐÅÒÅÐÏÌÎÅÎÉÅ ÂÕÆÅÒÁ ÏÔ fd=%d"
#: /home/eddy/Docs/SAO/C_diff/snippets_library/socket.c:562 #: /home/eddy/Docs/SAO/C_diff/snippets_library/socket.c:572
#, c-format #, c-format
msgid "Server thread: can't write data to ringbuffer: overflow from fd=%d" msgid "Server thread: can't write data to ringbuffer: overflow from fd=%d"
msgstr "ðÏÔÏË ÓÅÒ×ÅÒÁ: ÎÅ ÍÏÇÕ ÓÏÈÒÁÎÉÔØ ÄÁÎÎÙÅ × ËÏÌØÃÅ×ÏÍ ÂÕÆÅÒÅ, " msgstr "ðÏÔÏË ÓÅÒ×ÅÒÁ: ÎÅ ÍÏÇÕ ÓÏÈÒÁÎÉÔØ ÄÁÎÎÙÅ × ËÏÌØÃÅ×ÏÍ ÂÕÆÅÒÅ, "
"ÐÅÒÅÐÏÌÎÅÎÉÅ ÏÔ fd=%d" "ÐÅÒÅÐÏÌÎÅÎÉÅ ÏÔ fd=%d"
#. buffer overflow #. buffer overflow
#: /home/eddy/Docs/SAO/C_diff/snippets_library/socket.c:574 #: /home/eddy/Docs/SAO/C_diff/snippets_library/socket.c:584
#, c-format #, c-format
msgid "Server thread: buffer overflow from fd=%d" msgid "Server thread: buffer overflow from fd=%d"
msgstr "ðÏÔÏË ÓÅÒ×ÅÒÁ: ÐÅÒÅÐÏÌÎÅÎÉÅ ÂÕÆÅÒÁ ÏÔ fd=%d" msgstr "ðÏÔÏË ÓÅÒ×ÅÒÁ: ÐÅÒÅÐÏÌÎÅÎÉÅ ÂÕÆÅÒÁ ÏÔ fd=%d"
#. never reached #. never reached
#: /home/eddy/Docs/SAO/C_diff/snippets_library/socket.c:664 #: /home/eddy/Docs/SAO/C_diff/snippets_library/socket.c:681
#, c-format #, c-format
msgid "Unsupported socket type %d" msgid "Unsupported socket type %d"
msgstr "îÅÐÏÄÄÅÒÖÉ×ÁÅÍÙÊ ÔÉÐ ÓÏËÅÔÁ %d" msgstr "îÅÐÏÄÄÅÒÖÉ×ÁÅÍÙÊ ÔÉÐ ÓÏËÅÔÁ %d"

View File

@@ -191,6 +191,18 @@ void *get_aptr(void *paptr, sl_argtype_e type){
return aptr[i - 1]; return aptr[i - 1];
} }
static int cmpstringp(const void *p1, const void *p2){
if(!p1 || !p2) return 0;
const char *str1 = * (char * const *) p1, *str2 = * (char * const *) p2;
if(!str1 && !str2) return 0;
else if(!str1) return 1;
else if(!str2) return -1;
return strcmp(str1, str2);
}
static int cmpcharp(const void *p1, const void *p2){
return (int)(*(char * const)p1 - *(char *const)p2);
}
/** /**
* @brief sl_parseargs_hf - parse arguments with user help funtion * @brief sl_parseargs_hf - parse arguments with user help funtion
* @param argc - amount of arguments * @param argc - amount of arguments
@@ -246,17 +258,6 @@ void sl_parseargs_hf(int *argc, char ***argv, sl_option_t *options, void (*helpf
} }
} }
// sort all lists & check for repeating // sort all lists & check for repeating
int cmpstringp(const void *p1, const void *p2){
if(!p1 || !p2) return 0;
const char *str1 = * (char * const *) p1, *str2 = * (char * const *) p2;
if(!str1 && !str2) return 0;
else if(!str1) return 1;
else if(!str2) return -1;
return strcmp(str1, str2);
}
int cmpcharp(const void *p1, const void *p2){
return (int)(*(char * const)p1 - *(char *const)p2);
}
qsort(longlist, optsize, sizeof(char *), cmpstringp); qsort(longlist, optsize, sizeof(char *), cmpstringp);
qsort(shortlist,optsize, sizeof(char), cmpcharp); qsort(shortlist,optsize, sizeof(char), cmpcharp);
char *prevl = longlist[0], prevshrt = shortlist[0]; char *prevl = longlist[0], prevshrt = shortlist[0];
@@ -336,7 +337,10 @@ void sl_parseargs_hf(int *argc, char ***argv, sl_option_t *options, void (*helpf
type = "string"; type = "string";
break; break;
case arg_function: case arg_function:
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wpedantic"
result = ((sl_argfn_t)aptr)(optarg); result = ((sl_argfn_t)aptr)(optarg);
#pragma GCC diagnostic pop
break; break;
} }
if(!result){ if(!result){
@@ -460,6 +464,49 @@ void sl_showhelp(int oindex, sl_option_t *options){
exit(-1); exit(-1);
} }
static int findsubopt(char *par, sl_suboption_t *so){
int idx = 0;
if(!par) return -1;
while(so[idx].name){
if(strcasecmp(par, so[idx].name) == 0) return idx;
++idx;
}
return -1; // badarg
}
static int opt_setarg(sl_suboption_t *so, int idx, char *val){
sl_suboption_t *soptr = &so[idx];
int result = FALSE;
void *aptr = soptr->argptr;
switch(soptr->type){
default:
case arg_none:
if(soptr->argptr) *((int*)aptr) += 1; // increment value
result = TRUE;
break;
case arg_int:
result = myatoll(aptr, val, arg_int);
break;
case arg_longlong:
result = myatoll(aptr, val, arg_longlong);
break;
case arg_double:
result = myatod(aptr, val, arg_double);
break;
case arg_float:
result = myatod(aptr, val, arg_float);
break;
case arg_string:
result = (*((void**)aptr) = (void*)strdup(val)) != NULL;
break;
case arg_function:
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wpedantic"
result = ((sl_argfn_t)aptr)(val);
#pragma GCC diagnostic pop
break;
}
return result;
}
/** /**
* @brief sl_get_suboption - get suboptions from parameter string * @brief sl_get_suboption - get suboptions from parameter string
* @param str - parameter string * @param str - parameter string
@@ -467,46 +514,6 @@ void sl_showhelp(int oindex, sl_option_t *options){
* @return TRUE if all OK * @return TRUE if all OK
*/ */
int sl_get_suboption(char *str, sl_suboption_t *opt){ int sl_get_suboption(char *str, sl_suboption_t *opt){
int findsubopt(char *par, sl_suboption_t *so){
int idx = 0;
if(!par) return -1;
while(so[idx].name){
if(strcasecmp(par, so[idx].name) == 0) return idx;
++idx;
}
return -1; // badarg
}
int opt_setarg(sl_suboption_t *so, int idx, char *val){
sl_suboption_t *soptr = &so[idx];
int result = FALSE;
void *aptr = soptr->argptr;
switch(soptr->type){
default:
case arg_none:
if(soptr->argptr) *((int*)aptr) += 1; // increment value
result = TRUE;
break;
case arg_int:
result = myatoll(aptr, val, arg_int);
break;
case arg_longlong:
result = myatoll(aptr, val, arg_longlong);
break;
case arg_double:
result = myatod(aptr, val, arg_double);
break;
case arg_float:
result = myatod(aptr, val, arg_float);
break;
case arg_string:
result = (*((void**)aptr) = (void*)strdup(val)) != NULL;
break;
case arg_function:
result = ((sl_argfn_t)aptr)(val);
break;
}
return result;
}
char *tok; char *tok;
int ret = FALSE; int ret = FALSE;
char *tmpbuf; char *tmpbuf;

View File

@@ -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 // 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){ if(*path == 0){
DBG("convert name starting from 0"); DBG("convert name starting from 0");
apath[0] = 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){ }else if(strncmp("\\0", path, 2) == 0){
DBG("convert name starting from \\0"); DBG("convert name starting from \\0");
apath[0] = 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; return apath;
} }
@@ -358,7 +365,7 @@ static sl_sock_hresult_e msgparser(sl_sock_t *client, char *str){
int keylen = strlen(key); int keylen = strlen(key);
char *numstart = NULL; char *numstart = NULL;
const char *bra = "([{", *ket = ")]}"; const char *bra = "([{", *ket = ")]}";
char *found = strchr(ket, key[keylen - 1]); char *found = strchr((char*)ket, key[keylen - 1]);
DBG("found=%s", found); DBG("found=%s", found);
if(found){ if(found){
char *keyend = strchr(key, bra[found - ket]); // find starting bracket char *keyend = strchr(key, bra[found - ket]); // find starting bracket
@@ -462,7 +469,9 @@ static void *serverthread(void _U_ *d){
// ZERO - listening server socket // ZERO - listening server socket
poll_set[0].fd = sockfd; poll_set[0].fd = sockfd;
poll_set[0].events = POLLIN; poll_set[0].events = POLLIN;
// disconnect client // disconnect client (no way to make this function non-nested)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wpedantic"
void disconnect_(sl_sock_t *c, int N){ void disconnect_(sl_sock_t *c, int N){
DBG("Disconnect client \"%s\" (fd=%d)", c->IP, c->fd); DBG("Disconnect client \"%s\" (fd=%d)", c->IP, c->fd);
if(s->disconnect_handler) s->disconnect_handler(c); if(s->disconnect_handler) s->disconnect_handler(c);
@@ -489,6 +498,7 @@ static void *serverthread(void _U_ *d){
pthread_mutex_unlock(&c->mutex); pthread_mutex_unlock(&c->mutex);
--nfd; --nfd;
} }
#pragma GCC diagnostic pop
// allocate buffer with size not less than RB size // allocate buffer with size not less than RB size
size_t bufsize = s->buffer->length; // as RB should be 1 byte less, this is OK size_t bufsize = s->buffer->length; // as RB should be 1 byte less, this is OK
uint8_t *buf = MALLOC(uint8_t, bufsize); uint8_t *buf = MALLOC(uint8_t, bufsize);
@@ -637,28 +647,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){ 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; if(!path || type >= SOCKT_AMOUNT) return NULL;
printf("OPen\n");
FNAME();
if(bufsiz < 256) bufsiz = 256; if(bufsiz < 256) bufsiz = 256;
int sock = -1; int sock = -1;
struct addrinfo ai = {0}, *res = &ai; struct addrinfo ai = {0}, *res = &ai;
struct sockaddr_un unaddr = {0}; struct sockaddr_un unaddr = {0};
char *str = NULL;
ai.ai_socktype = SOCK_STREAM; ai.ai_socktype = SOCK_STREAM;
switch(type){ switch(type){
case SOCKT_UNIX: 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; if(!str) return NULL;
unaddr.sun_family = AF_UNIX; unaddr.sun_family = AF_UNIX;
ai.ai_addr = (struct sockaddr*) &unaddr; 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_family = AF_UNIX;
//ai.ai_socktype = SOCK_SEQPACKET; //ai.ai_socktype = SOCK_SEQPACKET;
}
break; break;
case SOCKT_NET: case SOCKT_NET:
case SOCKT_NETLOCAL: 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; break;
default: // never reached default: // never reached
WARNX(_("Unsupported socket type %d"), type); WARNX(_("Unsupported socket type %d"), type);
@@ -675,9 +692,9 @@ static sl_sock_t *sl_sock_open(sl_socktype_e type, const char *path, sl_sock_hit
sl_sock_delete(&s); sl_sock_delete(&s);
return NULL; return NULL;
}else{ // fill node/service }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{ else{
char *delim = strchr(path, ':'); char *delim = strchr((char*)path, ':');
if(!delim) s->service = strdup(path); // only port if(!delim) s->service = strdup(path); // only port
else{ else{
if(delim == path) s->service = strdup(path+1); if(delim == path) s->service = strdup(path+1);
@@ -716,7 +733,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){ for(struct addrinfo *p = res; p; p = p->ai_next){
if((sock = socket(p->ai_family, p->ai_socktype, p->ai_protocol)) < 0) continue; 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){ if(isserver){
int reuseaddr = 1; int reuseaddr = 1;
if(setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &reuseaddr, sizeof(int)) == -1){ if(setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &reuseaddr, sizeof(int)) == -1){
@@ -737,10 +754,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){ if(connect(sock, p->ai_addr, p->ai_addrlen) == -1){
WARN("connect()"); WARN("connect()");
close(sock); sock = -1; close(sock); sock = -1;
continue;
} }
} }
break; break;
} }
if(type != SOCKT_UNIX) freeaddrinfo(res); // don't forget to free memory allocated with getaddrinfo
if(sock < 0) sl_sock_delete(&s); if(sock < 0) sl_sock_delete(&s);
else{ else{
s->fd = sock; s->fd = sock;

View File

@@ -418,6 +418,8 @@ size_t sl_RB_writestr(sl_ringbuffer_t *b, char *s);
/******************************************************************************\ /******************************************************************************\
The original socket.h 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 // handler result: what to send to client
typedef enum{ typedef enum{
@@ -448,10 +450,10 @@ typedef struct{
// optional keyword number like key[12] = 500 // optional keyword number like key[12] = 500
typedef struct{ 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` int n; // if n < 0 there was no any number in `key`
} sl_sock_keyno_t; } sl_sock_keyno_t;
#define SL_SOCK_KEYNO_DEFAULT (sl_sock_keyno_t){.magick = -INFINITY, .n = -1} #define SL_SOCK_KEYNO_DEFAULT {.magick = -INFINITY, .n = -1}
void sl_sock_keyno_init(sl_sock_keyno_t*); void sl_sock_keyno_init(sl_sock_keyno_t*);
int sl_sock_keyno_check(sl_sock_keyno_t*); int sl_sock_keyno_check(sl_sock_keyno_t*);
@@ -478,6 +480,9 @@ typedef enum{
struct sl_sock; 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 // default max clients amount
#define SL_DEF_MAXCLIENTS (32) #define SL_DEF_MAXCLIENTS (32)
// custom socket handlers: connect/disconnect/etc // 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_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_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); sl_sock_hresult_e sl_sock_strhandler(sl_sock_t *client, sl_sock_hitem_t *hitem, const char *str);