laforge submitted this change.

View Change


Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved
Make socket.c compile without libsctp support (--disable-libsctp)

Change-Id: I214a16b60e0149a8b1cdcfd3c788cc56a1a40476
---
M src/core/socket.c
1 file changed, 13 insertions(+), 0 deletions(-)

diff --git a/src/core/socket.c b/src/core/socket.c
index ce73cd8..d36a5f4 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -1868,6 +1868,7 @@
return 0;
}

+#ifdef HAVE_LIBSCTP
/*! Get multiple IP addresses and/or port number on socket in separate string buffers
* \param[in] fd file descriptor of socket.
* \param[out] ip_proto IPPROTO of the socket, eg: IPPROTO_SCTP.
@@ -1956,6 +1957,7 @@
local ? sctp_freeladdrs(addrs) : sctp_freepaddrs(addrs);
return rc;
}
+#endif

/*! Get local IP address on socket
* \param[in] fd file descriptor of socket
@@ -2018,6 +2020,7 @@
return talloc_asprintf(ctx, "(%s)", str);
}

+#ifdef HAVE_LIBSCTP
/*! Format multiple IP addresses and/or port number into a combined string buffer
* \param[out] str Destination string buffer.
* \param[in] str_len sizeof(str), usually OSMO_SOCK_MULTIADDR_PEER_STR_MAXLEN.
@@ -2123,6 +2126,7 @@

return sb.chars_needed;
}
+#endif

/*! Get address/port information on socket in provided string buffer, like "r=1.2.3.4:5<->l=6.7.8.9:10".
* This does not include braces like osmo_sock_get_name().

To view, visit change 36055. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I214a16b60e0149a8b1cdcfd3c788cc56a1a40476
Gerrit-Change-Number: 36055
Gerrit-PatchSet: 2
Gerrit-Owner: jolly <andreas@eversberg.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-CC: pespin <pespin@sysmocom.de>
Gerrit-MessageType: merged