Module: kamailio
Branch: master
Commit: 51a774089c59a3861063ee4e9b4e21051c2bf192
URL: https://github.com/kamailio/kamailio/commit/51a774089c59a3861063ee4e9b4e210…
Author: Kamailio Dev <kamailio.dev(a)kamailio.org>
Committer: Kamailio Dev <kamailio.dev(a)kamailio.org>
Date: 2021-08-06T09:01:22+02:00
modules: readme files regenerated - ruxc ... [skip ci]
---
Modified: src/modules/ruxc/README
---
Diff: https://github.com/kamailio/kamailio/commit/51a774089c59a3861063ee4e9b4e210…
Patch: https://github.com/kamailio/kamailio/commit/51a774089c59a3861063ee4e9b4e210…
---
diff --git a/src/modules/ruxc/README b/src/modules/ruxc/README
index e437234139..45b80a85c5 100644
--- a/src/modules/ruxc/README
+++ b/src/modules/ruxc/README
@@ -131,6 +131,10 @@ modparam("ruxc", "http_tlsmode", 1)
(and TLS handshake) when all requests are performed against the same
HTTP/S server.
+ Set to 2 in order to keep connections per base URL (scheme://host:port)
+ indexed in a hash map. Useful when doing HTTP/S requests to many
+ servers.
+
Default value is 0 (new connection for each request).
Example 1.3. Set http_reuse parameter
Module: kamailio
Branch: master
Commit: 21b187f57a092f8ed9f51a62786a98c910b1febf
URL: https://github.com/kamailio/kamailio/commit/21b187f57a092f8ed9f51a62786a98c…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2021-08-06T08:54:29+02:00
ruxc: docs for reuse mode 2
---
Modified: src/modules/ruxc/doc/ruxc_admin.xml
---
Diff: https://github.com/kamailio/kamailio/commit/21b187f57a092f8ed9f51a62786a98c…
Patch: https://github.com/kamailio/kamailio/commit/21b187f57a092f8ed9f51a62786a98c…
---
diff --git a/src/modules/ruxc/doc/ruxc_admin.xml b/src/modules/ruxc/doc/ruxc_admin.xml
index e07c05c9f1..794301bc06 100644
--- a/src/modules/ruxc/doc/ruxc_admin.xml
+++ b/src/modules/ruxc/doc/ruxc_admin.xml
@@ -106,6 +106,11 @@ modparam("ruxc", "http_tlsmode", 1)
handshake) when all requests are performed against the same HTTP/S server.
</para>
<para>
+ Set to 2 in order to keep connections per base URL (scheme://host:port)
+ indexed in a hash map. Useful when doing HTTP/S requests to many
+ servers.
+ </para>
+ <para>
<emphasis>
Default value is 0 (new connection for each request).
</emphasis>
Hello,
I noticed that some Kamailio modules use /proc/net/tcp for statistics
(ratelimit, pipelimit, snmpstats) but it seems to be deprecated (See
https://www.kernel.org/doc/html/latest/networking/proc_net_tcp.html).
Is the data from that reliable? My question is because we used the module
ratelimit for a long time and after Kernel upgrades it was verified that
the network limit is triggering with low traffic.
Thanks
Module: kamailio
Branch: master
Commit: e3875c01adf576f179374a926e69e99c0094e5b4
URL: https://github.com/kamailio/kamailio/commit/e3875c01adf576f179374a926e69e99…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2021-08-04T14:15:38+02:00
misc/tools/protoshoot: removed svn id and history
---
Modified: misc/tools/protoshoot/protoshoot.c
---
Diff: https://github.com/kamailio/kamailio/commit/e3875c01adf576f179374a926e69e99…
Patch: https://github.com/kamailio/kamailio/commit/e3875c01adf576f179374a926e69e99…
---
diff --git a/misc/tools/protoshoot/protoshoot.c b/misc/tools/protoshoot/protoshoot.c
index 352e1018a6..6eced5fc2b 100644
--- a/misc/tools/protoshoot/protoshoot.c
+++ b/misc/tools/protoshoot/protoshoot.c
@@ -1,4 +1,3 @@
-/* $Id$ */
/*
*
* Copyright (C) 2001-2003 FhG Fokus
@@ -20,14 +19,10 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-/*
- * History:
- * 2005-09-09 basic tcp support added (andrei)
- */
@@ -50,7 +45,6 @@
#include <signal.h>
-static char *id="$Id$";
static char *version="protoshoot 0.4";
static char* help_msg="\
Usage: protoshoot -f file -d address -p port -c count [-v]\n\
@@ -87,7 +81,7 @@ int main (int argc, char** argv)
char buf[BUF_SIZE];
struct hostent* he;
struct sockaddr_in addr;
-
+
int count;
int verbose;
char *fname;
@@ -104,7 +98,7 @@ int main (int argc, char** argv)
struct linger t_linger;
int k;
int err;
-
+
/* init */
count=1;
verbose=0;
@@ -190,7 +184,6 @@ int main (int argc, char** argv)
break;
case 'V':
printf("version: %s\n", version);
- printf("%s\n",id);
exit(0);
break;
case 'h':
@@ -213,7 +206,7 @@ int main (int argc, char** argv)
abort();
}
}
-
+
/* check if all the required params are present */
if (fname==0){
fprintf(stderr, "Missing -f file\n");
@@ -238,13 +231,13 @@ int main (int argc, char** argv)
exit(-1);
}
if (proto==PROTO_UDP || (proto==PROTO_SCTP && !sctp_o2o)) con_no=1;
-
+
/* ignore sigpipe */
if (signal(SIGPIPE, SIG_IGN)==SIG_ERR){
fprintf(stderr, "failed to ignore SIGPIPE: %s\n", strerror(errno));
exit(-1);
}
-
+
/* open packet file */
fd=open(fname, O_RDONLY);
if (fd<0){
@@ -274,7 +267,7 @@ int main (int argc, char** argv)
addr.sin_len=sizeof(struct sockaddr_in);
#endif
memcpy(&addr.sin_addr.s_addr, he->h_addr_list[0], he->h_length);
-
+
for (k=0; k<con_no; k++){
switch(proto){
case PROTO_UDP:
@@ -285,7 +278,7 @@ int main (int argc, char** argv)
break;
#ifdef USE_SCTP
case PROTO_SCTP:
- sock = socket(he->h_addrtype,
+ sock = socket(he->h_addrtype,
sctp_o2o?SOCK_STREAM:SOCK_SEQPACKET,
IPPROTO_SCTP);
break;
@@ -333,8 +326,7 @@ int main (int argc, char** argv)
fprintf(stderr, "ERROR: connect: %s\n", strerror(errno));
goto error;
}
-
-
+
/* flood loop */
t=throttle;
for (r=0; r<count; r++){
@@ -366,7 +358,7 @@ int main (int argc, char** argv)
}
}
}
-
+
close(sock);
if ((verbose) && (k%1000==999)) { putchar('#'); fflush(stdout); }
}
C (gcc) [M outbound.so] outbound_mod.o
outbound_mod.c: In function 'mod_init':
outbound_mod.c:112:25: warning: pointer targets in passing argument 1 of 'SHA1' differ in signedness [-Wpointer-sign]
SHA1(flow_token_secret.s, flow_token_secret.len, ob_key.s);
~~~~~~~~~~~~~~~~~^~
In file included from outbound_mod.c:28:
/usr/include/openssl/sha.h:44:16: note: expected 'const unsigned char *' but argument is of type 'char *'
unsigned char *SHA1(const unsigned char *d, size_t n, unsigned char *md);
^~~~
outbound_mod.c:112:58: warning: pointer targets in passing argument 3 of 'SHA1' differ in signedness [-Wpointer-sign]
SHA1(flow_token_secret.s, flow_token_secret.len, ob_key.s);
~~~~~~^~
In file included from outbound_mod.c:28:
/usr/include/openssl/sha.h:44:16: note: expected 'unsigned char *' but argument is of type 'char *'
unsigned char *SHA1(const unsigned char *d, size_t n, unsigned char *md);
^~~~
<!-- Kamailio Pull Request Template -->
<!--
IMPORTANT:
- for detailed contributing guidelines, read:
https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md
- pull requests must be done to master branch, unless they are backports
of fixes from master branch to a stable branch
- backports to stable branches must be done with 'git cherry-pick -x ...'
- code is contributed under BSD for core and main components (tm, sl, auth, tls)
- code is contributed GPLv2 or a compatible license for the other components
- GPL code is contributed with OpenSSL licensing exception
-->
#### Pre-Submission Checklist
<!-- Go over all points below, and after creating the PR, tick all the checkboxes that apply -->
<!-- All points should be verified, otherwise, read the CONTRIBUTING guidelines from above-->
<!-- If you're unsure about any of these, don't hesitate to ask on sr-dev mailing list -->
- [x] Commit message has the format required by CONTRIBUTING guide
- [x] Commits are split per component (core, individual modules, libs, utils, ...)
- [x] Each component has a single commit (if not, squash them into one commit)
- [x] 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
- [x] 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:
<!-- Go over all points below, and after creating the PR, tick the checkboxes that apply -->
- [ ] PR should be backported to stable branches
- [x] Tested changes locally
- [ ] Related to issue #XXXX (replace XXXX with an open issue number)
#### Description
explicit types cast to fix compiler warning:
https://lists.kamailio.org/pipermail/sr-dev/2021-August/063482.html
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/2812
-- Commit Summary --
* outbound: fix compiler warning on SHA1() call
-- File Changes --
M src/modules/outbound/outbound_mod.c (2)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/2812.patchhttps://github.com/kamailio/kamailio/pull/2812.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/2812