bughz/tinyproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

network.c: simplify get_ip_string()

Browse Source 
fixes warnings "cast increases required alignment of target type"
closes #3
This commit is contained in:
rofl0r 2016-01-02 10:35:41 +00:00
parent 800c3a250c
commit 90a2cfbc54
2 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/network.c
View File

@ -249,35 +249,20 @@ CLEANUP:
* Convert the network address into either a dotted-decimal or an IPv6 * Convert the network address into either a dotted-decimal or an IPv6
* hex string. * hex string.
*/ */
char *get_ip_string (struct sockaddr *sa, char *buf, size_t buflen) const char *get_ip_string (struct sockaddr *sa, char *buf, size_t buflen)
{ {
int af;
void* addr;
assert (sa != NULL); assert (sa != NULL);
assert (buf != NULL); assert (buf != NULL);
assert (buflen != 0); assert (buflen != 0);
buf[0] = '\0'; /* start with an empty string */ buf[0] = '\0'; /* start with an empty string */
af = sa->sa_family;
switch (sa->sa_family) { if(af != AF_INET && af != AF_INET6) return NULL;
case AF_INET: addr = (af == AF_INET ?
{ (void*)&(((struct sockaddr_in *) (void*)sa)->sin_addr) :
struct sockaddr_in *sa_in = (struct sockaddr_in *) sa; (void*)&(((struct sockaddr_in6 *) (void*)sa)->sin6_addr) );
return inet_ntop(af, addr, buf, buflen);
inet_ntop (AF_INET, &sa_in->sin_addr, buf, buflen);
break;
}
case AF_INET6:
{
struct sockaddr_in6 *sa_in6 =
(struct sockaddr_in6 *) sa;
inet_ntop (AF_INET6, &sa_in6->sin6_addr, buf, buflen);
break;
}
default:
/* no valid family */
return NULL;
}
return buf;
} }
/* /*

2
src/network.h
View File

@ -27,7 +27,7 @@ extern ssize_t safe_read (int fd, char *buffer, size_t count);
extern int write_message (int fd, const char *fmt, ...); extern int write_message (int fd, const char *fmt, ...);
extern ssize_t readline (int fd, char **whole_buffer); extern ssize_t readline (int fd, char **whole_buffer);
extern char *get_ip_string (struct sockaddr *sa, char *buf, size_t len); extern const char *get_ip_string (struct sockaddr *sa, char *buf, size_t len);
extern int full_inet_pton (const char *ip, void *dst); extern int full_inet_pton (const char *ip, void *dst);
#endif #endif