[MERGED] libosmo-sccp[master]: sccp: fix handling of default IP addresses in osmo_sccp_simp...

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: sccp: fix handling of default IP addresses in 
osmo_sccp_simple_client()
..


sccp: fix handling of default IP addresses in osmo_sccp_simple_client()

When the default IP addresses (remote or local) the respective
struct value should be set to NULL.

Fix wrong ?:-notation.

Change-Id: I312caf9d54cedb02034e4ef88fdd2e6ad9ca1c34
---
M src/sccp_user.c
1 file changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/sccp_user.c b/src/sccp_user.c
index 9116b60..4e28aa0 100644
--- a/src/sccp_user.c
+++ b/src/sccp_user.c
@@ -404,10 +404,10 @@
goto out_rt;
asp_created = true;
 
-   default_local_ip ? asp->cfg.local.host =
-   talloc_strdup(asp, default_local_ip) : NULL;
-   default_remote_ip ? asp->cfg.remote.host =
-   talloc_strdup(asp, default_remote_ip) : NULL;
+   asp->cfg.local.host =
+   default_local_ip ? asp->cfg.local.host : NULL;
+   asp->cfg.remote.host =
+   default_remote_ip ? asp->cfg.remote.host : NULL;
 
osmo_ss7_as_add_asp(as, asp->cfg.name);
}

-- 
To view, visit https://gerrit.osmocom.org/3479
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I312caf9d54cedb02034e4ef88fdd2e6ad9ca1c34
Gerrit-PatchSet: 1
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Owner: dexter 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder

libosmo-sccp[master]: sccp: fix handling of default IP addresses in osmo_sccp_simp...

[Harald Welte]

Patch Set 1: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/3479
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I312caf9d54cedb02034e4ef88fdd2e6ad9ca1c34
Gerrit-PatchSet: 1
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Owner: dexter 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-HasComments: No

[PATCH] libosmo-sccp[master]: sccp: fix handling of default IP addresses in osmo_sccp_simp...

[dexter]

Review at  https://gerrit.osmocom.org/3479

sccp: fix handling of default IP addresses in osmo_sccp_simple_client()

When the default IP addresses (remote or local) the respective
struct value should be set to NULL.

Fix wrong ?:-notation.

Change-Id: I312caf9d54cedb02034e4ef88fdd2e6ad9ca1c34
---
M src/sccp_user.c
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/79/3479/1

diff --git a/src/sccp_user.c b/src/sccp_user.c
index 9116b60..4e28aa0 100644
--- a/src/sccp_user.c
+++ b/src/sccp_user.c
@@ -404,10 +404,10 @@
goto out_rt;
asp_created = true;
 
-   default_local_ip ? asp->cfg.local.host =
-   talloc_strdup(asp, default_local_ip) : NULL;
-   default_remote_ip ? asp->cfg.remote.host =
-   talloc_strdup(asp, default_remote_ip) : NULL;
+   asp->cfg.local.host =
+   default_local_ip ? asp->cfg.local.host : NULL;
+   asp->cfg.remote.host =
+   default_remote_ip ? asp->cfg.remote.host : NULL;
 
osmo_ss7_as_add_asp(as, asp->cfg.name);
}

-- 
To view, visit https://gerrit.osmocom.org/3479
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I312caf9d54cedb02034e4ef88fdd2e6ad9ca1c34
Gerrit-PatchSet: 1
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Owner: dexter