diff options
| author | George Joseph <gjoseph@digium.com> | 2016-06-09 08:20:33 -0600 |
|---|---|---|
| committer | George Joseph <gjoseph@digium.com> | 2016-06-09 09:50:00 -0500 |
| commit | a99ddc6a0d2b9075c2cc436a6770c8ac889f5286 (patch) | |
| tree | 7c9b835eb9ed843ffeb164b8df7c4833db1aec8a /channels | |
| parent | bd3b6e9f193c7f07d86070df4866a4f5cbd82055 (diff) | |
build: Fix ast_sockaddr initialization to be more portable
A change to glibc 2.22 changed the order of the sockadddr_storage
members which caused the places where we do an initialization of
ast_sockaddr with '{ { 0, 0, } }' to fail compilation. Those
initializers (which we shouldn't have been using anyway) have been
replaced with memsets.
Change-Id: Idd1b3b320903d8771bfe221f0b015685de628fa4
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index f64845472..77f438262 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -15790,11 +15790,12 @@ static void start_register_timeout(struct sip_registry *reg) static const char *sip_sanitized_host(const char *host) { - struct ast_sockaddr addr = { { 0, 0, }, }; + struct ast_sockaddr addr; /* peer/sip_pvt->tohost and sip_registry->hostname should never have a port * in them, so we use PARSE_PORT_FORBID here. If this lookup fails, we return * the original host which is most likely a host name and not an IP. */ + memset(&addr, 0, sizeof(addr)); if (!ast_sockaddr_parse(&addr, host, PARSE_PORT_FORBID)) { return host; } |