sr-dev October 2017

sr-dev@lists.kamailio.org

33 participants
301 discussions

[kamailio/kamailio] Add comments to db schema and set default last_modified (#1276)

by Isaac McDonald

Added comments explaining table functionality to MySQL schema. These comments can be viewed in MySQL when browsing the schema which helps admins understand what each table is used for. Changed default value for "last_modified" in grp table from "1970-01-01 00:00:00" to CURRENT_TIMESTAMP and set to automatically update "last_modified" if the record is ever updated. This means that if a record is inserted without a "last_modified", MySQL will insert an accurate time-stamp instead of 0000-00-00 00:00:00 which breaks the SQLOPS module.   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1276 -- Commit Summary -- * Add comments to db schema and default timestamp -- File Changes -- M misc/scripts/mysql/my_create.sql (32) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1276.patch https://github.com/kamailio/kamailio/pull/1276.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1276

7 years, 1 month

git:5.0:64a2bec2: jsonrpcs: use same socket for dgram transport

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.0 Commit: 64a2bec28f1182b30bd3404f6bba9b2f4e868258 URL: https://github.com/kamailio/kamailio/commit/64a2bec28f1182b30bd3404f6bba9b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-23T10:18:15+02:00 jsonrpcs: use same socket for dgram transport (cherry picked from commit 9c3883a7856d6fb12d103baf3f784107a7c3914c) --- Modified: src/modules/jsonrpcs/jsonrpcs_sock.c --- Diff: https://github.com/kamailio/kamailio/commit/64a2bec28f1182b30bd3404f6bba9b2… Patch: https://github.com/kamailio/kamailio/commit/64a2bec28f1182b30bd3404f6bba9b2… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_sock.c b/src/modules/jsonrpcs/jsonrpcs_sock.c index b17feb2b86..4dc4740e90 100644 --- a/src/modules/jsonrpcs/jsonrpcs_sock.c +++ b/src/modules/jsonrpcs/jsonrpcs_sock.c @@ -63,7 +63,7 @@ typedef struct{ } jsonrpc_dgram_address_t; typedef struct jsonrpc_dgram_rx_tx { - int rx_sock, tx_sock; + int rx_sock; } jsonrpc_dgram_rx_tx_t; /* dgram variables */ @@ -71,7 +71,7 @@ static int jsonrpc_dgram_socket_domain = AF_LOCAL; static jsonrpc_dgram_sockaddr_t jsonrpc_dgram_addr; /* dgram socket definition parameter */ -static jsonrpc_dgram_rx_tx_t jsonrpc_dgram_sockets; +static jsonrpc_dgram_rx_tx_t jsonrpc_dgram_sockets = { -1 }; /* dgram unixsock specific parameters */ char *jsonrpc_dgram_socket = NAME "_rpc.sock"; @@ -89,7 +89,7 @@ int jsonrpc_dgram_child_init(int rank); int jsonrpc_dgram_destroy(void); -void jsonrpc_dgram_server(int rx_sock, int tx_sock); +void jsonrpc_dgram_server(int rx_sock); static int jsonrpc_dgram_init_socks(void); static int jsonrpc_dgram_post_process(void); @@ -363,7 +363,7 @@ int jsonrpc_dgram_init_server(jsonrpc_dgram_sockaddr_t *addr, case AF_INET: if (bind(socks->rx_sock, &addr->udp_addr.s, - sockaddru_len(addr->udp_addr))< 0) { + sockaddru_len(addr->udp_addr))< 0) { LM_ERR("bind: %s\n", strerror(errno)); goto err_rx; } @@ -377,13 +377,12 @@ int jsonrpc_dgram_init_server(jsonrpc_dgram_sockaddr_t *addr, break; default: LM_ERR("domain not supported\n"); - goto err_both; + goto err_rx; } - jsonrpc_dgram_create_reply_socket(socks->tx_sock, socket_domain, err_both); optval = 64 * 1024; - if (setsockopt(socks->tx_sock, SOL_SOCKET, SO_SNDBUF, + if (setsockopt(socks->rx_sock, SOL_SOCKET, SO_SNDBUF, (void*)&optval, sizeof(optval)) ==-1){ LM_ERR("failed to increse send buffer size via setsockopt " " SO_SNDBUF (%d) - %d: %s\n", optval, @@ -391,9 +390,18 @@ int jsonrpc_dgram_init_server(jsonrpc_dgram_sockaddr_t *addr, /* continue, non-critical */ } + /* Turn non-blocking mode on for tx*/ + flags = fcntl(socks->rx_sock, F_GETFL); + if (flags == -1){ + LM_ERR("fcntl failed: %s\n", strerror(errno)); + goto err_rx; + } + if (fcntl(socks->rx_sock, F_SETFL, flags | O_NONBLOCK) == -1) { + LM_ERR("fcntl: set non-blocking failed: %s\n", strerror(errno)); + goto err_rx; + } return 0; -err_both: - if(socks->tx_sock>=0) close(socks->tx_sock); + err_rx: if(socks->rx_sock>=0) close(socks->rx_sock); return -1; @@ -440,8 +448,7 @@ static void jsonrpc_dgram_process(int rank) jsonrpc_dgram_write_buffer_len = JSONRPC_DGRAM_BUF_SIZE ; - jsonrpc_dgram_server(jsonrpc_dgram_sockets.rx_sock, - jsonrpc_dgram_sockets.tx_sock); + jsonrpc_dgram_server(jsonrpc_dgram_sockets.rx_sock); exit(-1); } @@ -480,8 +487,7 @@ int jsonrpc_dgram_child_init(int rank) static int jsonrpc_dgram_post_process(void) { /* close the sockets */ - close(jsonrpc_dgram_sockets.rx_sock); - close(jsonrpc_dgram_sockets.tx_sock); + if(jsonrpc_dgram_sockets.rx_sock>=0) close(jsonrpc_dgram_sockets.rx_sock); return 0; } @@ -549,7 +555,7 @@ static int jsonrpc_dgram_send_data(int fd, char* buf, unsigned int len, return n; } -void jsonrpc_dgram_server(int rx_sock, int tx_sock) +void jsonrpc_dgram_server(int rx_sock) { int ret; str scmd; @@ -608,7 +614,7 @@ void jsonrpc_dgram_server(int rx_sock, int tx_sock) jr->rcode, jr->rbody.s, jr->rbody.len, jr->rbody.s); - jsonrpc_dgram_send_data(tx_sock, jr->rbody.s, jr->rbody.len, + jsonrpc_dgram_send_data(rx_sock, jr->rbody.s, jr->rbody.len, (struct sockaddr*)&jsonrpc_dgram_reply_addr, jsonrpc_dgram_reply_addr_len, jsonrpc_dgram_timeout);

7 years, 1 month

git:5.0:8a01ab81: jsonrpcs: init fifo stream via mod init callback

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.0 Commit: 8a01ab81074313efa5daa4cc87d571f67f43178a URL: https://github.com/kamailio/kamailio/commit/8a01ab81074313efa5daa4cc87d571f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-23T10:18:03+02:00 jsonrpcs: init fifo stream via mod init callback (cherry picked from commit 17697e4bcabcec62d4393c6ae60fabec7d1c8e98) --- Modified: src/modules/jsonrpcs/jsonrpcs_fifo.c --- Diff: https://github.com/kamailio/kamailio/commit/8a01ab81074313efa5daa4cc87d571f… Patch: https://github.com/kamailio/kamailio/commit/8a01ab81074313efa5daa4cc87d571f…

7 years, 1 month

git:5.0:04c774d8: jsonrpcs: init dgram sockets via mod init callback

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.0 Commit: 04c774d86a62387a6f297b29040220e7dcf597f1 URL: https://github.com/kamailio/kamailio/commit/04c774d86a62387a6f297b29040220e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-23T10:17:54+02:00 jsonrpcs: init dgram sockets via mod init callback (cherry picked from commit 70fa5b79e413e162427f5a8ffad3357252c517e2) --- Modified: src/modules/jsonrpcs/jsonrpcs_sock.c --- Diff: https://github.com/kamailio/kamailio/commit/04c774d86a62387a6f297b29040220e… Patch: https://github.com/kamailio/kamailio/commit/04c774d86a62387a6f297b29040220e… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_sock.c b/src/modules/jsonrpcs/jsonrpcs_sock.c index 94a068b3f5..b17feb2b86 100644 --- a/src/modules/jsonrpcs/jsonrpcs_sock.c +++ b/src/modules/jsonrpcs/jsonrpcs_sock.c @@ -90,7 +90,7 @@ int jsonrpc_dgram_destroy(void); void jsonrpc_dgram_server(int rx_sock, int tx_sock); -static int jsonrpc_dgram_pre_process(void); +static int jsonrpc_dgram_init_socks(void); static int jsonrpc_dgram_post_process(void); int jsonrpc_dgram_mod_init(void) @@ -241,6 +241,11 @@ int jsonrpc_dgram_mod_init(void) jsonrpc_dgram_socket, strlen(jsonrpc_dgram_socket)); done: + if(jsonrpc_dgram_init_socks()!=0) { + LM_ERR("init datagram sockets function failed\n"); + return -1; + } + /* add space for extra processes */ register_procs(jsonrpc_dgram_workers); /* add child to update local config framework structures */ @@ -395,7 +400,7 @@ int jsonrpc_dgram_init_server(jsonrpc_dgram_sockaddr_t *addr, } -static int jsonrpc_dgram_pre_process(void) +static int jsonrpc_dgram_init_socks(void) { int res; @@ -448,10 +453,6 @@ int jsonrpc_dgram_child_init(int rank) int pid; if (rank==PROC_MAIN) { - if(jsonrpc_dgram_pre_process()!=0) { - LM_ERR("pre-fork function failed\n"); - return -1; - } for(i=0; i<jsonrpc_dgram_workers; i++) { pid=fork_process(PROC_RPC, "JSONRPCS DATAGRAM", 1); if (pid<0)

7 years, 1 month

git:5.0:6702903e: jsonrpcs: set rank PROC_RPC for fifo and dgram processes

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.0 Commit: 6702903ee846590fd0759f71fa741af95150677d URL: https://github.com/kamailio/kamailio/commit/6702903ee846590fd0759f71fa741af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-23T10:17:43+02:00 jsonrpcs: set rank PROC_RPC for fifo and dgram processes (cherry picked from commit a2b862a74c77bc71238d9b8c9ef19ddb629c75ce) --- Modified: src/modules/jsonrpcs/jsonrpcs_fifo.c Modified: src/modules/jsonrpcs/jsonrpcs_sock.c --- Diff: https://github.com/kamailio/kamailio/commit/6702903ee846590fd0759f71fa741af… Patch: https://github.com/kamailio/kamailio/commit/6702903ee846590fd0759f71fa741af… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_fifo.c b/src/modules/jsonrpcs/jsonrpcs_fifo.c index 53d62662b0..85b65c43bc 100644 --- a/src/modules/jsonrpcs/jsonrpcs_fifo.c +++ b/src/modules/jsonrpcs/jsonrpcs_fifo.c @@ -550,7 +550,7 @@ int jsonrpc_fifo_child_init(int rank) LM_ERR("invalid fifo file path\n"); } - pid=fork_process(PROC_NOCHLDINIT, "JSONRPCS FIFO", 1); + pid=fork_process(PROC_RPC, "JSONRPCS FIFO", 1); if (pid<0) { return -1; /* error */ } diff --git a/src/modules/jsonrpcs/jsonrpcs_sock.c b/src/modules/jsonrpcs/jsonrpcs_sock.c index 3347959448..94a068b3f5 100644 --- a/src/modules/jsonrpcs/jsonrpcs_sock.c +++ b/src/modules/jsonrpcs/jsonrpcs_sock.c @@ -453,7 +453,7 @@ int jsonrpc_dgram_child_init(int rank) return -1; } for(i=0; i<jsonrpc_dgram_workers; i++) { - pid=fork_process(PROC_NOCHLDINIT, "JSONRPCS DATAGRAM", 1); + pid=fork_process(PROC_RPC, "JSONRPCS DATAGRAM", 1); if (pid<0) return -1; /* error */ if(pid==0) {

7 years, 1 month

git:5.0:0b02a2f0: jsonrpcs: updated the name of module in description of extra procs

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.0 Commit: 0b02a2f0cfecdb72e020d3d6bdab4ac6e97ecd27 URL: https://github.com/kamailio/kamailio/commit/0b02a2f0cfecdb72e020d3d6bdab4ac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-23T10:17:34+02:00 jsonrpcs: updated the name of module in description of extra procs (cherry picked from commit d4f11b6ffc459faf5c6577cc3374420c1469baeb) --- Modified: src/modules/jsonrpcs/jsonrpcs_fifo.c Modified: src/modules/jsonrpcs/jsonrpcs_sock.c --- Diff: https://github.com/kamailio/kamailio/commit/0b02a2f0cfecdb72e020d3d6bdab4ac… Patch: https://github.com/kamailio/kamailio/commit/0b02a2f0cfecdb72e020d3d6bdab4ac… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_fifo.c b/src/modules/jsonrpcs/jsonrpcs_fifo.c index c44a55c236..53d62662b0 100644 --- a/src/modules/jsonrpcs/jsonrpcs_fifo.c +++ b/src/modules/jsonrpcs/jsonrpcs_fifo.c @@ -550,7 +550,7 @@ int jsonrpc_fifo_child_init(int rank) LM_ERR("invalid fifo file path\n"); } - pid=fork_process(PROC_NOCHLDINIT, "JSONRPC-S FIFO", 1); + pid=fork_process(PROC_NOCHLDINIT, "JSONRPCS FIFO", 1); if (pid<0) { return -1; /* error */ } diff --git a/src/modules/jsonrpcs/jsonrpcs_sock.c b/src/modules/jsonrpcs/jsonrpcs_sock.c index c61fa6da28..3347959448 100644 --- a/src/modules/jsonrpcs/jsonrpcs_sock.c +++ b/src/modules/jsonrpcs/jsonrpcs_sock.c @@ -453,7 +453,7 @@ int jsonrpc_dgram_child_init(int rank) return -1; } for(i=0; i<jsonrpc_dgram_workers; i++) { - pid=fork_process(PROC_NOCHLDINIT, "JSONRPC-S DATAGRAM", 1); + pid=fork_process(PROC_NOCHLDINIT, "JSONRPCS DATAGRAM", 1); if (pid<0) return -1; /* error */ if(pid==0) {

7 years, 1 month

git:master:9c3883a7: jsonrpcs: use same socket for dgram transport

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9c3883a7856d6fb12d103baf3f784107a7c3914c URL: https://github.com/kamailio/kamailio/commit/9c3883a7856d6fb12d103baf3f78410… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-22T09:49:22+02:00 jsonrpcs: use same socket for dgram transport --- Modified: src/modules/jsonrpcs/jsonrpcs_sock.c --- Diff: https://github.com/kamailio/kamailio/commit/9c3883a7856d6fb12d103baf3f78410… Patch: https://github.com/kamailio/kamailio/commit/9c3883a7856d6fb12d103baf3f78410… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_sock.c b/src/modules/jsonrpcs/jsonrpcs_sock.c index b17feb2b86..4dc4740e90 100644 --- a/src/modules/jsonrpcs/jsonrpcs_sock.c +++ b/src/modules/jsonrpcs/jsonrpcs_sock.c @@ -63,7 +63,7 @@ typedef struct{ } jsonrpc_dgram_address_t; typedef struct jsonrpc_dgram_rx_tx { - int rx_sock, tx_sock; + int rx_sock; } jsonrpc_dgram_rx_tx_t; /* dgram variables */ @@ -71,7 +71,7 @@ static int jsonrpc_dgram_socket_domain = AF_LOCAL; static jsonrpc_dgram_sockaddr_t jsonrpc_dgram_addr; /* dgram socket definition parameter */ -static jsonrpc_dgram_rx_tx_t jsonrpc_dgram_sockets; +static jsonrpc_dgram_rx_tx_t jsonrpc_dgram_sockets = { -1 }; /* dgram unixsock specific parameters */ char *jsonrpc_dgram_socket = NAME "_rpc.sock"; @@ -89,7 +89,7 @@ int jsonrpc_dgram_child_init(int rank); int jsonrpc_dgram_destroy(void); -void jsonrpc_dgram_server(int rx_sock, int tx_sock); +void jsonrpc_dgram_server(int rx_sock); static int jsonrpc_dgram_init_socks(void); static int jsonrpc_dgram_post_process(void); @@ -363,7 +363,7 @@ int jsonrpc_dgram_init_server(jsonrpc_dgram_sockaddr_t *addr, case AF_INET: if (bind(socks->rx_sock, &addr->udp_addr.s, - sockaddru_len(addr->udp_addr))< 0) { + sockaddru_len(addr->udp_addr))< 0) { LM_ERR("bind: %s\n", strerror(errno)); goto err_rx; } @@ -377,13 +377,12 @@ int jsonrpc_dgram_init_server(jsonrpc_dgram_sockaddr_t *addr, break; default: LM_ERR("domain not supported\n"); - goto err_both; + goto err_rx; } - jsonrpc_dgram_create_reply_socket(socks->tx_sock, socket_domain, err_both); optval = 64 * 1024; - if (setsockopt(socks->tx_sock, SOL_SOCKET, SO_SNDBUF, + if (setsockopt(socks->rx_sock, SOL_SOCKET, SO_SNDBUF, (void*)&optval, sizeof(optval)) ==-1){ LM_ERR("failed to increse send buffer size via setsockopt " " SO_SNDBUF (%d) - %d: %s\n", optval, @@ -391,9 +390,18 @@ int jsonrpc_dgram_init_server(jsonrpc_dgram_sockaddr_t *addr, /* continue, non-critical */ } + /* Turn non-blocking mode on for tx*/ + flags = fcntl(socks->rx_sock, F_GETFL); + if (flags == -1){ + LM_ERR("fcntl failed: %s\n", strerror(errno)); + goto err_rx; + } + if (fcntl(socks->rx_sock, F_SETFL, flags | O_NONBLOCK) == -1) { + LM_ERR("fcntl: set non-blocking failed: %s\n", strerror(errno)); + goto err_rx; + } return 0; -err_both: - if(socks->tx_sock>=0) close(socks->tx_sock); + err_rx: if(socks->rx_sock>=0) close(socks->rx_sock); return -1; @@ -440,8 +448,7 @@ static void jsonrpc_dgram_process(int rank) jsonrpc_dgram_write_buffer_len = JSONRPC_DGRAM_BUF_SIZE ; - jsonrpc_dgram_server(jsonrpc_dgram_sockets.rx_sock, - jsonrpc_dgram_sockets.tx_sock); + jsonrpc_dgram_server(jsonrpc_dgram_sockets.rx_sock); exit(-1); } @@ -480,8 +487,7 @@ int jsonrpc_dgram_child_init(int rank) static int jsonrpc_dgram_post_process(void) { /* close the sockets */ - close(jsonrpc_dgram_sockets.rx_sock); - close(jsonrpc_dgram_sockets.tx_sock); + if(jsonrpc_dgram_sockets.rx_sock>=0) close(jsonrpc_dgram_sockets.rx_sock); return 0; } @@ -549,7 +555,7 @@ static int jsonrpc_dgram_send_data(int fd, char* buf, unsigned int len, return n; } -void jsonrpc_dgram_server(int rx_sock, int tx_sock) +void jsonrpc_dgram_server(int rx_sock) { int ret; str scmd; @@ -608,7 +614,7 @@ void jsonrpc_dgram_server(int rx_sock, int tx_sock) jr->rcode, jr->rbody.s, jr->rbody.len, jr->rbody.s); - jsonrpc_dgram_send_data(tx_sock, jr->rbody.s, jr->rbody.len, + jsonrpc_dgram_send_data(rx_sock, jr->rbody.s, jr->rbody.len, (struct sockaddr*)&jsonrpc_dgram_reply_addr, jsonrpc_dgram_reply_addr_len, jsonrpc_dgram_timeout);

7 years, 1 month

git:master:17697e4b: jsonrpcs: init fifo stream via mod init callback

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 17697e4bcabcec62d4393c6ae60fabec7d1c8e98 URL: https://github.com/kamailio/kamailio/commit/17697e4bcabcec62d4393c6ae60fabe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-21T12:19:41+02:00 jsonrpcs: init fifo stream via mod init callback --- Modified: src/modules/jsonrpcs/jsonrpcs_fifo.c --- Diff: https://github.com/kamailio/kamailio/commit/17697e4bcabcec62d4393c6ae60fabe… Patch: https://github.com/kamailio/kamailio/commit/17697e4bcabcec62d4393c6ae60fabe…

7 years, 1 month

git:master:70fa5b79: jsonrpcs: init dgram sockets via mod init callback

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 70fa5b79e413e162427f5a8ffad3357252c517e2 URL: https://github.com/kamailio/kamailio/commit/70fa5b79e413e162427f5a8ffad3357… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-21T12:10:29+02:00 jsonrpcs: init dgram sockets via mod init callback --- Modified: src/modules/jsonrpcs/jsonrpcs_sock.c --- Diff: https://github.com/kamailio/kamailio/commit/70fa5b79e413e162427f5a8ffad3357… Patch: https://github.com/kamailio/kamailio/commit/70fa5b79e413e162427f5a8ffad3357… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_sock.c b/src/modules/jsonrpcs/jsonrpcs_sock.c index 94a068b3f5..b17feb2b86 100644 --- a/src/modules/jsonrpcs/jsonrpcs_sock.c +++ b/src/modules/jsonrpcs/jsonrpcs_sock.c @@ -90,7 +90,7 @@ int jsonrpc_dgram_destroy(void); void jsonrpc_dgram_server(int rx_sock, int tx_sock); -static int jsonrpc_dgram_pre_process(void); +static int jsonrpc_dgram_init_socks(void); static int jsonrpc_dgram_post_process(void); int jsonrpc_dgram_mod_init(void) @@ -241,6 +241,11 @@ int jsonrpc_dgram_mod_init(void) jsonrpc_dgram_socket, strlen(jsonrpc_dgram_socket)); done: + if(jsonrpc_dgram_init_socks()!=0) { + LM_ERR("init datagram sockets function failed\n"); + return -1; + } + /* add space for extra processes */ register_procs(jsonrpc_dgram_workers); /* add child to update local config framework structures */ @@ -395,7 +400,7 @@ int jsonrpc_dgram_init_server(jsonrpc_dgram_sockaddr_t *addr, } -static int jsonrpc_dgram_pre_process(void) +static int jsonrpc_dgram_init_socks(void) { int res; @@ -448,10 +453,6 @@ int jsonrpc_dgram_child_init(int rank) int pid; if (rank==PROC_MAIN) { - if(jsonrpc_dgram_pre_process()!=0) { - LM_ERR("pre-fork function failed\n"); - return -1; - } for(i=0; i<jsonrpc_dgram_workers; i++) { pid=fork_process(PROC_RPC, "JSONRPCS DATAGRAM", 1); if (pid<0)

7 years, 1 month

git:master:a2b862a7: jsonrpcs: set rank PROC_RPC for fifo and dgram processes

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a2b862a74c77bc71238d9b8c9ef19ddb629c75ce URL: https://github.com/kamailio/kamailio/commit/a2b862a74c77bc71238d9b8c9ef19dd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-21T11:47:35+02:00 jsonrpcs: set rank PROC_RPC for fifo and dgram processes --- Modified: src/modules/jsonrpcs/jsonrpcs_fifo.c Modified: src/modules/jsonrpcs/jsonrpcs_sock.c --- Diff: https://github.com/kamailio/kamailio/commit/a2b862a74c77bc71238d9b8c9ef19dd… Patch: https://github.com/kamailio/kamailio/commit/a2b862a74c77bc71238d9b8c9ef19dd… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_fifo.c b/src/modules/jsonrpcs/jsonrpcs_fifo.c index 53d62662b0..85b65c43bc 100644 --- a/src/modules/jsonrpcs/jsonrpcs_fifo.c +++ b/src/modules/jsonrpcs/jsonrpcs_fifo.c @@ -550,7 +550,7 @@ int jsonrpc_fifo_child_init(int rank) LM_ERR("invalid fifo file path\n"); } - pid=fork_process(PROC_NOCHLDINIT, "JSONRPCS FIFO", 1); + pid=fork_process(PROC_RPC, "JSONRPCS FIFO", 1); if (pid<0) { return -1; /* error */ } diff --git a/src/modules/jsonrpcs/jsonrpcs_sock.c b/src/modules/jsonrpcs/jsonrpcs_sock.c index 3347959448..94a068b3f5 100644 --- a/src/modules/jsonrpcs/jsonrpcs_sock.c +++ b/src/modules/jsonrpcs/jsonrpcs_sock.c @@ -453,7 +453,7 @@ int jsonrpc_dgram_child_init(int rank) return -1; } for(i=0; i<jsonrpc_dgram_workers; i++) { - pid=fork_process(PROC_NOCHLDINIT, "JSONRPCS DATAGRAM", 1); + pid=fork_process(PROC_RPC, "JSONRPCS DATAGRAM", 1); if (pid<0) return -1; /* error */ if(pid==0) {

7 years, 1 month

← Newer
1
...
17
18
19
20
21
22
23
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2017