colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: use nm_utils_share_rules_add_all_rules() from NMDevice

Browse Source
This commit is contained in:
Thomas Haller
2020-10-27 17:17:25 +01:00
parent be7bf38a3a
commit 33041e04af
1 changed files with 1 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/devices/nm-device.c
View File

@@ -11594,9 +11594,6 @@ start_sharing(NMDevice *self, NMIP4Config *config, GError **error)
{ {
NMDevicePrivate * priv = NM_DEVICE_GET_PRIVATE(self); NMDevicePrivate * priv = NM_DEVICE_GET_PRIVATE(self);
NMActRequest * req; NMActRequest * req;
char str_addr[INET_ADDRSTRLEN];
char str_mask[INET_ADDRSTRLEN];
guint32 netmask, network;
const NMPlatformIP4Address *ip4_addr = NULL; const NMPlatformIP4Address *ip4_addr = NULL;
const char * ip_iface; const char * ip_iface;
GError * local = NULL; GError * local = NULL;
@@ -11628,69 +11625,9 @@ start_sharing(NMDevice *self, NMIP4Config *config, GError **error)
req = nm_device_get_act_request(self); req = nm_device_get_act_request(self);
g_return_val_if_fail(req, FALSE); g_return_val_if_fail(req, FALSE);
netmask = _nm_utils_ip4_prefix_to_netmask(ip4_addr->plen);
_nm_utils_inet4_ntop(netmask, str_mask);
network = ip4_addr->address & netmask;
_nm_utils_inet4_ntop(network, str_addr);
share_rules = nm_utils_share_rules_new(); share_rules = nm_utils_share_rules_new();
nm_utils_share_rules_add_rule_v( nm_utils_share_rules_add_all_rules(share_rules, ip_iface, ip4_addr->address, ip4_addr->plen);
share_rules,
"nat",
"POSTROUTING --source %s/%s ! --destination %s/%s --jump MASQUERADE",
str_addr,
str_mask,
str_addr,
str_mask);
nm_utils_share_rules_add_rule_v(
share_rules,
"filter",
"FORWARD --destination %s/%s --out-interface %s --match state --state "
"ESTABLISHED,RELATED --jump ACCEPT",
str_addr,
str_mask,
ip_iface);
nm_utils_share_rules_add_rule_v(share_rules,
"filter",
"FORWARD --source %s/%s --in-interface %s --jump ACCEPT",
str_addr,
str_mask,
ip_iface);
nm_utils_share_rules_add_rule_v(share_rules,
"filter",
"FORWARD --in-interface %s --out-interface %s --jump ACCEPT",
ip_iface,
ip_iface);
nm_utils_share_rules_add_rule_v(share_rules,
"filter",
"FORWARD --out-interface %s --jump REJECT",
ip_iface);
nm_utils_share_rules_add_rule_v(share_rules,
"filter",
"FORWARD --in-interface %s --jump REJECT",
ip_iface);
nm_utils_share_rules_add_rule_v(
share_rules,
"filter",
"INPUT --in-interface %s --protocol udp --destination-port 67 --jump ACCEPT",
ip_iface);
nm_utils_share_rules_add_rule_v(
share_rules,
"filter",
"INPUT --in-interface %s --protocol tcp --destination-port 67 --jump ACCEPT",
ip_iface);
nm_utils_share_rules_add_rule_v(
share_rules,
"filter",
"INPUT --in-interface %s --protocol udp --destination-port 53 --jump ACCEPT",
ip_iface);
nm_utils_share_rules_add_rule_v(
share_rules,
"filter",
"INPUT --in-interface %s --protocol tcp --destination-port 53 --jump ACCEPT",
ip_iface);
nm_utils_share_rules_apply(share_rules, TRUE); nm_utils_share_rules_apply(share_rules, TRUE);