mirror
/
devilutionX-ZeroTierOne
mirror of https://github.com/diasurgical/ZeroTierOne.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

GitHub issue #994

pull/2/head
Adam Ierymenko 7 years ago
parent
6f9e3e3b78
commit
de0a5aa840
No known key found for this signature in database
GPG Key ID: 1657198823E52A61
2 changed files with 20 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      osdep/LinuxNetLink.cpp
  2. 6
      osdep/LinuxNetLink.hpp

22
osdep/LinuxNetLink.cpp
Unescape View File

@ -11,6 +11,10 @@
*/ */
/****/ /****/
#include "../node/Constants.hpp"
#ifdef __LINUX__
#include "LinuxNetLink.hpp" #include "LinuxNetLink.hpp"
#include <unistd.h> #include <unistd.h>
@ -53,7 +57,7 @@ LinuxNetLink::LinuxNetLink()
_setSocketTimeout(_fd, 1); _setSocketTimeout(_fd, 1);
_la.nl_family = AF_NETLINK; _la.nl_family = AF_NETLINK;
_la.nl_pid = getpid()+1; _la.nl_pid = 0; //getpid()+1;
_la.nl_groups = RTMGRP_LINK|RTMGRP_IPV4_IFADDR|RTMGRP_IPV6_IFADDR|RTMGRP_IPV4_ROUTE|RTMGRP_IPV6_ROUTE|RTMGRP_NOTIFY; _la.nl_groups = RTMGRP_LINK|RTMGRP_IPV4_IFADDR|RTMGRP_IPV6_IFADDR|RTMGRP_IPV4_ROUTE|RTMGRP_IPV6_ROUTE|RTMGRP_NOTIFY;
if (bind(_fd, (struct sockaddr*)&_la, sizeof(_la))) { if (bind(_fd, (struct sockaddr*)&_la, sizeof(_la))) {
fprintf(stderr, "Error connecting to RTNETLINK: %s\n", strerror(errno)); fprintf(stderr, "Error connecting to RTNETLINK: %s\n", strerror(errno));
@ -433,7 +437,7 @@ void LinuxNetLink::_requestIPv4Routes()
struct sockaddr_nl la; struct sockaddr_nl la;
la.nl_family = AF_NETLINK; la.nl_family = AF_NETLINK;
la.nl_pid = getpid(); la.nl_pid = 0; //getpid();
la.nl_groups = RTMGRP_IPV4_ROUTE; la.nl_groups = RTMGRP_IPV4_ROUTE;
if(bind(fd, (struct sockaddr*)&la, sizeof(la))) { if(bind(fd, (struct sockaddr*)&la, sizeof(la))) {
fprintf(stderr, "Error binding RTNETLINK (_requiestIPv4Routes #1): %s\n", strerror(errno)); fprintf(stderr, "Error binding RTNETLINK (_requiestIPv4Routes #1): %s\n", strerror(errno));
@ -486,7 +490,7 @@ void LinuxNetLink::_requestIPv6Routes()
struct sockaddr_nl la; struct sockaddr_nl la;
la.nl_family = AF_NETLINK; la.nl_family = AF_NETLINK;
la.nl_pid = getpid(); la.nl_pid = 0; //getpid();
la.nl_groups = RTMGRP_IPV6_ROUTE; la.nl_groups = RTMGRP_IPV6_ROUTE;
if(bind(fd, (struct sockaddr*)&la, sizeof(struct sockaddr_nl))) { if(bind(fd, (struct sockaddr*)&la, sizeof(struct sockaddr_nl))) {
fprintf(stderr, "Error binding RTNETLINK (_requestIPv6Routes #1): %s\n", strerror(errno)); fprintf(stderr, "Error binding RTNETLINK (_requestIPv6Routes #1): %s\n", strerror(errno));
@ -539,7 +543,7 @@ void LinuxNetLink::_requestInterfaceList()
struct sockaddr_nl la; struct sockaddr_nl la;
la.nl_family = AF_NETLINK; la.nl_family = AF_NETLINK;
la.nl_pid = getpid(); la.nl_pid = 0; //getpid();
la.nl_groups = RTMGRP_LINK; la.nl_groups = RTMGRP_LINK;
if(bind(fd, (struct sockaddr*)&la, sizeof(struct sockaddr_nl))) { if(bind(fd, (struct sockaddr*)&la, sizeof(struct sockaddr_nl))) {
fprintf(stderr, "Error binding RTNETLINK (_requestInterfaceList #1): %s\n", strerror(errno)); fprintf(stderr, "Error binding RTNETLINK (_requestInterfaceList #1): %s\n", strerror(errno));
@ -593,7 +597,7 @@ void LinuxNetLink::addRoute(const InetAddress &target, const InetAddress &via, c
struct sockaddr_nl la; struct sockaddr_nl la;
bzero(&la, sizeof(la)); bzero(&la, sizeof(la));
la.nl_family = AF_NETLINK; la.nl_family = AF_NETLINK;
la.nl_pid = getpid(); la.nl_pid = 0; //getpid();
if(bind(fd, (struct sockaddr*)&la, sizeof(struct sockaddr_nl))) { if(bind(fd, (struct sockaddr*)&la, sizeof(struct sockaddr_nl))) {
fprintf(stderr, "Error binding RTNETLINK (addRoute #1): %s\n", strerror(errno)); fprintf(stderr, "Error binding RTNETLINK (addRoute #1): %s\n", strerror(errno));
@ -708,7 +712,7 @@ void LinuxNetLink::delRoute(const InetAddress &target, const InetAddress &via, c
struct sockaddr_nl la; struct sockaddr_nl la;
la.nl_family = AF_NETLINK; la.nl_family = AF_NETLINK;
la.nl_pid = getpid(); la.nl_pid = 0; //getpid();
if(bind(fd, (struct sockaddr*)&la, sizeof(struct sockaddr_nl))) { if(bind(fd, (struct sockaddr*)&la, sizeof(struct sockaddr_nl))) {
fprintf(stderr, "Error binding RTNETLINK (delRoute #1): %s\n", strerror(errno)); fprintf(stderr, "Error binding RTNETLINK (delRoute #1): %s\n", strerror(errno));
@ -822,7 +826,7 @@ void LinuxNetLink::addAddress(const InetAddress &addr, const char *iface)
struct sockaddr_nl la; struct sockaddr_nl la;
memset(&la,0,sizeof(la)); memset(&la,0,sizeof(la));
la.nl_family = AF_NETLINK; la.nl_family = AF_NETLINK;
la.nl_pid = getpid(); la.nl_pid = 0; //getpid();
if (addr.isV4()) { if (addr.isV4()) {
la.nl_groups = RTMGRP_IPV4_IFADDR; la.nl_groups = RTMGRP_IPV4_IFADDR;
} else { } else {
@ -939,7 +943,7 @@ void LinuxNetLink::removeAddress(const InetAddress &addr, const char *iface)
struct sockaddr_nl la; struct sockaddr_nl la;
la.nl_family = AF_NETLINK; la.nl_family = AF_NETLINK;
la.nl_pid = getpid(); la.nl_pid = 0; //getpid();
if (addr.isV4()) { if (addr.isV4()) {
la.nl_groups = RTMGRP_IPV4_IFADDR; la.nl_groups = RTMGRP_IPV4_IFADDR;
} else { } else {
@ -1066,3 +1070,5 @@ int LinuxNetLink::_indexForInterface(const char *iface)
} }
} // namespace ZeroTier } // namespace ZeroTier
#endif

6
osdep/LinuxNetLink.hpp
Unescape View File

@ -14,6 +14,10 @@
#ifndef ZT_LINUX_NETLINK_HPP #ifndef ZT_LINUX_NETLINK_HPP
#define ZT_LINUX_NETLINK_HPP #define ZT_LINUX_NETLINK_HPP
#include "../node/Constants.hpp"
#ifdef __LINUX__
#include <vector> #include <vector>
#include <sys/socket.h> #include <sys/socket.h>
@ -113,4 +117,6 @@ private:
} }
#endif
#endif // ZT_LINUX_NETLINK_HPPS #endif // ZT_LINUX_NETLINK_HPPS
Write Preview
Loading…
Cancel
Save