git:master:61833193: dispatcher: fix force send socket functionality, was not working in some TCP scenarios
18 May
2023
18 May
'23
1:54 p.m.
Module: kamailio
Branch: master
Commit: 6183319381573e42b882d05ae1748539f7547d8c
URL: https://github.com/kamailio/kamailio/commit/6183319381573e42b882d05ae174853…
Author: Henning Westerholt <hw(a)gilawa.com>
Committer: Henning Westerholt <hw(a)gilawa.com>
Date: 2023-05-18T10:52:52Z
dispatcher: fix force send socket functionality, was not working in some TCP scenarios
---
Modified: src/modules/dispatcher/dispatch.c
---
Diff:
https://github.com/kamailio/kamailio/commit/6183319381573e42b882d05ae174853…
Patch:
https://github.com/kamailio/kamailio/commit/6183319381573e42b882d05ae174853…
---
diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c
index a07f779ab8..f0322a6b57 100644
--- a/src/modules/dispatcher/dispatch.c
+++ b/src/modules/dispatcher/dispatch.c
@@ -1869,7 +1869,8 @@ static inline int ds_push_dst(
break;
}
if(sock) {
- msg->force_send_socket = sock;
+ LM_DBG("set send socket to %.*s\n", sock->sock_str.len,
sock->sock_str.s);
+ set_force_socket(msg, sock);
}
return 0;
}
18 May
18 May
2:15 p.m.
Hi,
On 18/5/23 12:54, Henning Westerholt wrote:
Module: kamailio
Branch: master
Commit: 6183319381573e42b882d05ae1748539f7547d8c
URL:
https://github.com/kamailio/kamailio/commit/6183319381573e42b882d05ae174853…
We have to find a way to enforce clang-format. First commit after the huge merge...
now it doesn't pass the check.
diff --git a/src/modules/dispatcher/dispatch.c
b/src/modules/dispatcher/dispatch.c
index f0322a6b57..e8d7886ec9 100644
--- a/src/modules/dispatcher/dispatch.c
+++ b/src/modules/dispatcher/dispatch.c
@@ -1869,7 +1869,8 @@ static inline int ds_push_dst(
break;
}
if(sock) {
- LM_DBG("set send socket to %.*s\n", sock->sock_str.len,
sock->sock_str.s);
+ LM_DBG("set send socket to %.*s\n", sock->sock_str.len,
+ sock->sock_str.s);
set_force_socket(msg, sock);
}
return 0;
--
-----------------------------------------------------------------
| ,''`. Victor Seva |
| : :' : linuxmaniac(a)torreviejawireless.org |
| `. `' PGP Key ID: 0x51A09B18CF5A5068 |
| `- Debian Developer |
-----------------------------------------------------------------
2:30 p.m.
Hi Victor,
I was merging a patch that was finally verified yesterday evening in a test setup. Thanks
also for the other reply for the thread.
But your point is valid. Maybe we can use some git hooks or something, but it might have
some unintended side effects.
Let me have a look to fix the format for that commit.
Cheers,
Henning
-----Original Message-----
From: Victor Seva <linuxmaniac(a)torreviejawireless.org>
Sent: Donnerstag, 18. Mai 2023 13:15
To: sr-dev(a)lists.kamailio.org
Subject: [sr-dev] Re: git:master:61833193: dispatcher: fix force send socket
functionality, was not working in some TCP scenarios
Hi,
On 18/5/23 12:54, Henning Westerholt wrote:
Module: kamailio
Branch: master
Commit: 6183319381573e42b882d05ae1748539f7547d8c
URL:
https://github.com/kamailio/kamailio/commit/6183319381573e42b882d05ae174853…
We have to find a way to enforce clang-format. First commit after the huge merge...
now it doesn't pass the check.
diff --git a/src/modules/dispatcher/dispatch.c
b/src/modules/dispatcher/dispatch.c
index f0322a6b57..e8d7886ec9 100644
--- a/src/modules/dispatcher/dispatch.c
+++ b/src/modules/dispatcher/dispatch.c
@@ -1869,7 +1869,8 @@ static inline int ds_push_dst(
break;
}
if(sock) {
- LM_DBG("set send socket to %.*s\n", sock->sock_str.len,
sock->sock_str.s);
+ LM_DBG("set send socket to %.*s\n", sock->sock_str.len,
+ sock->sock_str.s);
set_force_socket(msg, sock);
}
return 0;
--
-----------------------------------------------------------------
| ,''`. Victor Seva |
| : :' : linuxmaniac(a)torreviejawireless.org |
| `. `' PGP Key ID: 0x51A09B18CF5A5068 |
| `- Debian Developer |
-----------------------------------------------------------------
2:43 p.m.
Should be fixed now. Just to be 100% safe - executing the clang-format in the Kamailio
root will pick up the correct format, right?
Cheers,
Henning
-----Original Message-----
From: Henning Westerholt
Sent: Donnerstag, 18. Mai 2023 13:30
To: Kamailio (SER) - Development Mailing List <sr-dev(a)lists.kamailio.org>
Cc: Victor Seva <linuxmaniac(a)torreviejawireless.org>
Subject: RE: [sr-dev] Re: git:master:61833193: dispatcher: fix force send socket
functionality, was not working in some TCP scenarios
Hi Victor,
I was merging a patch that was finally verified yesterday evening in a test setup. Thanks
also for the other reply for the thread.
But your point is valid. Maybe we can use some git hooks or something, but it might have
some unintended side effects.
Let me have a look to fix the format for that commit.
Cheers,
Henning
-----Original Message-----
From: Victor Seva <linuxmaniac(a)torreviejawireless.org>
Sent: Donnerstag, 18. Mai 2023 13:15
To: sr-dev(a)lists.kamailio.org
Subject: [sr-dev] Re: git:master:61833193: dispatcher: fix force send socket
functionality, was not working in some TCP scenarios
Hi,
On 18/5/23 12:54, Henning Westerholt wrote:
Module: kamailio
Branch: master
Commit: 6183319381573e42b882d05ae1748539f7547d8c
URL:
https://github.com/kamailio/kamailio/commit/6183319381573e42b882d05ae174853…
We have to find a way to enforce clang-format. First commit after the huge merge...
now it doesn't pass the check.
diff --git a/src/modules/dispatcher/dispatch.c
b/src/modules/dispatcher/dispatch.c
index f0322a6b57..e8d7886ec9 100644
--- a/src/modules/dispatcher/dispatch.c
+++ b/src/modules/dispatcher/dispatch.c
@@ -1869,7 +1869,8 @@ static inline int ds_push_dst(
break;
}
if(sock) {
- LM_DBG("set send socket to %.*s\n", sock->sock_str.len,
sock->sock_str.s);
+ LM_DBG("set send socket to %.*s\n", sock->sock_str.len,
+ sock->sock_str.s);
set_force_socket(msg, sock);
}
return 0;
--
-----------------------------------------------------------------
| ,''`. Victor Seva |
| : :' : linuxmaniac(a)torreviejawireless.org |
| `. `' PGP Key ID: 0x51A09B18CF5A5068 |
| `- Debian Developer |
-----------------------------------------------------------------
2:49 p.m.
Hi,
On 18/5/23 13:43, Henning Westerholt wrote:
Should be fixed now. Just to be 100% safe - executing
the clang-format in the Kamailio root will pick up the correct format, right?
Yes, it's fixed. Yes, executing the clang-format at the root of the repository will
pick the .clang-format configuration
Thanks
--
-----------------------------------------------------------------
| ,''`. Victor Seva |
| : :' : linuxmaniac(a)torreviejawireless.org |
| `. `' PGP Key ID: 0x51A09B18CF5A5068 |
| `- Debian Developer |
-----------------------------------------------------------------
585
days inactive
585
days old
4 comments
2 participants
participants (2)
-
Henning Westerholt -
Victor Seva