Change in osmo-hlr[master]: osmo-mslookup-client: fix segfault for respond_error() caller

2020-06-03 Thread neels 
neels has submitted this change. ( 
https://gerrit.osmocom.org/c/osmo-hlr/+/18651 )

Change subject: osmo-mslookup-client: fix segfault for respond_error() caller
..

osmo-mslookup-client: fix segfault for respond_error() caller

respond_error() passes r == 0. On error, consider it the last response for that
request.

Change-Id: I1acb0b8aa00c098d1f1f1cc17035daa38ce29fd3
---
M src/mslookup/osmo-mslookup-client.c
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved



diff --git a/src/mslookup/osmo-mslookup-client.c 
b/src/mslookup/osmo-mslookup-client.c
index 4a9e587..a200a7e 100644
--- a/src/mslookup/osmo-mslookup-client.c
+++ b/src/mslookup/osmo-mslookup-client.c
@@ -584,11 +584,11 @@
llist_for_each_entry_safe(c, n, _clients, entry) {
if (!strcmp(query_str, c->query_str)) {
socket_client_respond_result(c, g_buf);
-   if (r->last)
+   if (!r || r->last)
socket_client_close(c);
}
}
-   if (r->last)
+   if (!r || r->last)
globals.requests_handled++;
 }


--
To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/18651
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-hlr
Gerrit-Branch: master
Gerrit-Change-Id: I1acb0b8aa00c098d1f1f1cc17035daa38ce29fd3
Gerrit-Change-Number: 18651
Gerrit-PatchSet: 1
Gerrit-Owner: neels 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: neels 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

Change in osmo-hlr[master]: osmo-mslookup-client: fix segfault for respond_error() caller

2020-06-03 Thread neels 
neels has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-hlr/+/18651 )

Change subject: osmo-mslookup-client: fix segfault for respond_error() caller
..


Patch Set 1:

(2 comments)

https://gerrit.osmocom.org/c/osmo-hlr/+/18651/1/src/mslookup/osmo-mslookup-client.c
File src/mslookup/osmo-mslookup-client.c:

https://gerrit.osmocom.org/c/osmo-hlr/+/18651/1/src/mslookup/osmo-mslookup-client.c@587
PS1, Line 587:  if (!r || r->last)
> would be nice documenting this behavior (like r=NULL being passed by error.
see here...


https://gerrit.osmocom.org/c/osmo-hlr/+/18651/1/src/mslookup/osmo-mslookup-client.c@597
PS1, Line 597:  respond_result(query_str, NULL);
...here.

(This is "just" a cmdline tool, no public API/ABI)



--
To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/18651
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-hlr
Gerrit-Branch: master
Gerrit-Change-Id: I1acb0b8aa00c098d1f1f1cc17035daa38ce29fd3
Gerrit-Change-Number: 18651
Gerrit-PatchSet: 1
Gerrit-Owner: neels 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: neels 
Gerrit-Reviewer: pespin 
Gerrit-Comment-Date: Wed, 03 Jun 2020 17:29:26 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin 
Gerrit-MessageType: comment

Change in osmo-hlr[master]: osmo-mslookup-client: fix segfault for respond_error() caller

2020-06-03 Thread laforge 
laforge has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-hlr/+/18651 )

Change subject: osmo-mslookup-client: fix segfault for respond_error() caller
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/18651
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-hlr
Gerrit-Branch: master
Gerrit-Change-Id: I1acb0b8aa00c098d1f1f1cc17035daa38ce29fd3
Gerrit-Change-Number: 18651
Gerrit-PatchSet: 1
Gerrit-Owner: neels 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-Comment-Date: Wed, 03 Jun 2020 17:25:09 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

Change in osmo-hlr[master]: osmo-mslookup-client: fix segfault for respond_error() caller

2020-06-03 Thread pespin 
pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-hlr/+/18651 )

Change subject: osmo-mslookup-client: fix segfault for respond_error() caller
..


Patch Set 1: Code-Review+1

(1 comment)

https://gerrit.osmocom.org/c/osmo-hlr/+/18651/1/src/mslookup/osmo-mslookup-client.c
File src/mslookup/osmo-mslookup-client.c:

https://gerrit.osmocom.org/c/osmo-hlr/+/18651/1/src/mslookup/osmo-mslookup-client.c@587
PS1, Line 587:  if (!r || r->last)
would be nice documenting this behavior (like r=NULL being passed by error.



--
To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/18651
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-hlr
Gerrit-Branch: master
Gerrit-Change-Id: I1acb0b8aa00c098d1f1f1cc17035daa38ce29fd3
Gerrit-Change-Number: 18651
Gerrit-PatchSet: 1
Gerrit-Owner: neels 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin 
Gerrit-Comment-Date: Wed, 03 Jun 2020 17:17:37 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

Change in osmo-hlr[master]: osmo-mslookup-client: fix segfault for respond_error() caller

2020-06-03 Thread neels 
neels has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/osmo-hlr/+/18651 )


Change subject: osmo-mslookup-client: fix segfault for respond_error() caller
..

osmo-mslookup-client: fix segfault for respond_error() caller

respond_error() passes r == 0. On error, consider it the last response for that
request.

Change-Id: I1acb0b8aa00c098d1f1f1cc17035daa38ce29fd3
---
M src/mslookup/osmo-mslookup-client.c
1 file changed, 2 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/51/18651/1

diff --git a/src/mslookup/osmo-mslookup-client.c 
b/src/mslookup/osmo-mslookup-client.c
index 4a9e587..a200a7e 100644
--- a/src/mslookup/osmo-mslookup-client.c
+++ b/src/mslookup/osmo-mslookup-client.c
@@ -584,11 +584,11 @@
llist_for_each_entry_safe(c, n, _clients, entry) {
if (!strcmp(query_str, c->query_str)) {
socket_client_respond_result(c, g_buf);
-   if (r->last)
+   if (!r || r->last)
socket_client_close(c);
}
}
-   if (r->last)
+   if (!r || r->last)
globals.requests_handled++;
 }


--
To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/18651
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-hlr
Gerrit-Branch: master
Gerrit-Change-Id: I1acb0b8aa00c098d1f1f1cc17035daa38ce29fd3
Gerrit-Change-Number: 18651
Gerrit-PatchSet: 1
Gerrit-Owner: neels 
Gerrit-MessageType: newchange