aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDavid M. Syzdek <syzdek@bindlebinaries.com>2013-12-05 14:28:21 -0900
committerDavid M. Syzdek <syzdek@bindlebinaries.com>2013-12-05 14:28:21 -0900
commitf5f7f93fb32cb582f1ef9934fe8125d7ef3527fa (patch)
tree22d7de45a2d3023a909ac453ccabec2fd3dc0dcf
parent1b1cbf971a937c96b83c9537f42fec303d33c3ac (diff)
downloaddmstools-f5f7f93fb32cb582f1ef9934fe8125d7ef3527fa.tar.gz
dmstools-f5f7f93fb32cb582f1ef9934fe8125d7ef3527fa.tar.bz2
dmstools-f5f7f93fb32cb582f1ef9934fe8125d7ef3527fa.tar.xz
dmstools-f5f7f93fb32cb582f1ef9934fe8125d7ef3527fa.zip
Fixing porting issues.
-rw-r--r--src/macaddrinfo.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/macaddrinfo.c b/src/macaddrinfo.c
index 1012ba7..e87b7ba 100644
--- a/src/macaddrinfo.c
+++ b/src/macaddrinfo.c
@@ -81,6 +81,7 @@
81#include <signal.h> 81#include <signal.h>
82#include <netdb.h> 82#include <netdb.h>
83#include <arpa/inet.h> 83#include <arpa/inet.h>
84#include <errno.h>
84 85
85 86
86/////////////////// 87///////////////////
@@ -268,8 +269,6 @@ void mau_version(void);
268#pragma mark - Variables 269#pragma mark - Variables
269#endif 270#endif
270 271
271extern const int errno;
272
273const mau_command mau_cmdmap[] = 272const mau_command mau_cmdmap[] =
274{ 273{
275 { 274 {
@@ -888,7 +887,6 @@ int mau_conv_eui2sin(mau_config * cnf, const maueui64_t eui, struct sockaddr_in6
888{ 887{
889 assert(cnf != NULL); 888 assert(cnf != NULL);
890 memset(sin, 0, sizeof(struct sockaddr_in6)); 889 memset(sin, 0, sizeof(struct sockaddr_in6));
891 sin->sin6_len = sizeof(struct sockaddr_in6);
892 sin->sin6_family = AF_INET6; 890 sin->sin6_family = AF_INET6;
893 sin->sin6_addr.s6_addr[0] = 0xfe; 891 sin->sin6_addr.s6_addr[0] = 0xfe;
894 sin->sin6_addr.s6_addr[1] = 0x80; 892 sin->sin6_addr.s6_addr[1] = 0x80;
@@ -987,7 +985,7 @@ int mau_conv_sin2eui(mau_config * cnf, const struct sockaddr_in6 * sin, maueui64
987int mau_conv_sin2str(mau_config * cnf, const struct sockaddr_in6 * sin, maustr_t str) 985int mau_conv_sin2str(mau_config * cnf, const struct sockaddr_in6 * sin, maustr_t str)
988{ 986{
989 assert(cnf != NULL); 987 assert(cnf != NULL);
990 getnameinfo((struct sockaddr *)sin, sin->sin6_len, str, sizeof(maustr_t), NULL, 0, NI_NUMERICHOST|NI_NUMERICSERV); 988 getnameinfo((struct sockaddr *)sin, sizeof(struct sockaddr_in6), str, sizeof(maustr_t), NULL, 0, NI_NUMERICHOST|NI_NUMERICSERV);
991 return(0); 989 return(0);
992} 990}
993 991
@@ -1089,7 +1087,6 @@ int mau_conv_str2sin(mau_config * cnf, const maustr_t str, struct sockaddr_in6 *
1089 return(1); 1087 return(1);
1090 1088
1091 memset(sin, 0, sizeof(struct sockaddr_in6)); 1089 memset(sin, 0, sizeof(struct sockaddr_in6));
1092 sin->sin6_len = sizeof(struct sockaddr_in6);
1093 sin->sin6_family = AF_INET6; 1090 sin->sin6_family = AF_INET6;
1094 memcpy(sin, servinfo->ai_addr, sizeof(struct sockaddr_in6)); 1091 memcpy(sin, servinfo->ai_addr, sizeof(struct sockaddr_in6));
1095 1092