diff options
| author | tzafrir <tzafrir@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-09 20:37:08 +0000 |
|---|---|---|
| committer | tzafrir <tzafrir@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-09 20:37:08 +0000 |
| commit | bfe59dd5d2c5d0fc249cac872faee0dff69b2112 (patch) | |
| tree | 60a175c84f655c4c83cc7f413e2c3c86aedc96ea /res | |
| parent | 3cd07039e3a70a09eeb84c1a90900afc06fc2f74 (diff) | |
gcc 4.4 fix: union instead of cast
gcc 4.4 has more strict rules for aliasing. It doesn't like a
struct sockaddr_in pointer pointing to a struct sockaddr. So we make it
a union.
Merged revisions 217445 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@217519 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_phoneprov.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/res/res_phoneprov.c b/res/res_phoneprov.c index d71139e13..748327bf3 100644 --- a/res/res_phoneprov.c +++ b/res/res_phoneprov.c @@ -492,17 +492,20 @@ static struct ast_str *phoneprov_callback(struct ast_tcptls_session_instance *se /* Unless we are overridden by serveriface or serveraddr, we set the SERVER variable to * the IP address we are listening on that the phone contacted for this config file */ if (ast_strlen_zero(global_server)) { - struct sockaddr name; - socklen_t namelen = sizeof(name); + union { + struct sockaddr sa; + struct sockaddr_in sa_in; + } name; + socklen_t namelen = sizeof(name.sa); int res; - if ((res = getsockname(ser->fd, &name, &namelen))) { + if ((res = getsockname(ser->fd, &name.sa, &namelen))) { ast_log(LOG_WARNING, "Could not get server IP, breakage likely.\n"); } else { struct ast_var_t *var; struct extension *exten_iter; - if ((var = ast_var_assign("SERVER", ast_inet_ntoa(((struct sockaddr_in *)&name)->sin_addr)))) { + if ((var = ast_var_assign("SERVER", ast_inet_ntoa(name.sa_in.sin_addr)))) { AST_LIST_TRAVERSE(&route->user->extensions, exten_iter, entry) { AST_LIST_INSERT_TAIL(exten_iter->headp, var, entries); } |