Skip to content

Commit

Permalink
log_level::state -> debug
Browse files Browse the repository at this point in the history
  • Loading branch information
@jpihl
jpihl committed May 4, 2023
1 parent 8ca7071 commit 9ddbe6e
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 24 deletions.
26 changes: 13 additions & 13 deletions src/tunnel/detail/platform_linux/layer_netdevice.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ class layer_netdevice : public Super
return;
}

Super::do_log(log_level::state, log_kind::interface_renamed,
Super::do_log(log_level::debug, log_kind::interface_renamed,
log::str{"interface_name", interface_name.c_str()});

if (iface_up)
Expand Down Expand Up @@ -124,7 +124,7 @@ class layer_netdevice : public Super

bool is_if_up = (ifr.ifr_flags & IFF_UP) != 0;

Super::do_log(log_level::state, log_kind::is_up,
Super::do_log(log_level::debug, log_kind::is_up,
log::boolean{"is_up", is_if_up});

return is_if_up;
Expand All @@ -151,13 +151,13 @@ class layer_netdevice : public Super
ifr.ifr_flags |= IFF_UP;
Super::ioctl(m_dev_fd, SIOCSIFFLAGS, &ifr, error);

Super::do_log(log_level::state, log_kind::interface_up);
Super::do_log(log_level::debug, log_kind::interface_up);
}

auto is_down(std::error_code& error) const -> bool
{
assert(!error);
Super::do_log(log_level::state, log_kind::is_down);
Super::do_log(log_level::debug, log_kind::is_down);
return !is_up(error);
}

Expand All @@ -182,7 +182,7 @@ class layer_netdevice : public Super
ifr.ifr_flags &= ~IFF_UP;
Super::ioctl(m_dev_fd, SIOCSIFFLAGS, &ifr, error);

Super::do_log(log_level::state, log_kind::interface_down);
Super::do_log(log_level::debug, log_kind::interface_down);
}

void set_mtu(uint32_t mtu, std::error_code& error) const
Expand All @@ -209,7 +209,7 @@ class layer_netdevice : public Super

Super::ioctl(m_dev_fd, SIOCSIFMTU, &ifr, error);

Super::do_log(log_level::state, log_kind::set_mtu,
Super::do_log(log_level::debug, log_kind::set_mtu,
log::integer{"mtu", mtu});
}

Expand All @@ -224,7 +224,7 @@ class layer_netdevice : public Super

Super::ioctl(m_dev_fd, SIOCGIFMTU, &ifr, error);

Super::do_log(log_level::state, log_kind::interface_mtu,
Super::do_log(log_level::debug, log_kind::interface_mtu,
log::integer{"mtu", ifr.ifr_mtu});

return ifr.ifr_mtu;
Expand Down Expand Up @@ -265,7 +265,7 @@ class layer_netdevice : public Super

Super::ioctl(m_dev_fd, SIOCADDRT, &route, error);

Super::do_log(log_level::state, log_kind::enable_default_route);
Super::do_log(log_level::debug, log_kind::enable_default_route);
}

void disable_default_route(std::error_code& error) const
Expand Down Expand Up @@ -303,7 +303,7 @@ class layer_netdevice : public Super

Super::ioctl(m_dev_fd, SIOCDELRT, &route, error);

Super::do_log(log_level::state, log_kind::disable_default_route);
Super::do_log(log_level::debug, log_kind::disable_default_route);
}

auto ipv4(std::error_code& error) const -> std::string
Expand All @@ -326,7 +326,7 @@ class layer_netdevice : public Super

struct sockaddr_in* addr_in = (struct sockaddr_in*)&ifr.ifr_addr;

Super::do_log(log_level::state, log_kind::interface_ipv4,
Super::do_log(log_level::debug, log_kind::interface_ipv4,
log::str{"ip", ::inet_ntoa(addr_in->sin_addr)});

return ::inet_ntoa(addr_in->sin_addr);
Expand All @@ -352,7 +352,7 @@ class layer_netdevice : public Super

struct sockaddr_in* addr_in = (struct sockaddr_in*)&ifr.ifr_addr;

Super::do_log(log_level::state, log_kind::interface_ipv4_netmask,
Super::do_log(log_level::debug, log_kind::interface_ipv4_netmask,
log::str{"netmask", ::inet_ntoa(addr_in->sin_addr)});

return ::inet_ntoa(addr_in->sin_addr);
Expand Down Expand Up @@ -382,7 +382,7 @@ class layer_netdevice : public Super

Super::ioctl(m_dev_fd, SIOCSIFADDR, &ifr, error);

Super::do_log(log_level::state, log_kind::set_ipv4,
Super::do_log(log_level::debug, log_kind::set_ipv4,
log::str{"ip", address.c_str()});
}

Expand All @@ -409,7 +409,7 @@ class layer_netdevice : public Super

Super::ioctl(m_dev_fd, SIOCSIFNETMASK, &ifr, error);

Super::do_log(log_level::state, log_kind::set_ipv4_netmask,
Super::do_log(log_level::debug, log_kind::set_ipv4_netmask,
log::str{"netmask", netmask.c_str()});
}

Expand Down
2 changes: 1 addition & 1 deletion src/tunnel/detail/platform_linux/layer_netlink_v4.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ class layer_netlink_v4 : public Super
return false;
}

Super::do_log(log_level::state, log_kind::is_default_route,
Super::do_log(log_level::debug, log_kind::is_default_route,
log::boolean{"is_default_route",
default_interface == tun_interface});

Expand Down
20 changes: 10 additions & 10 deletions src/tunnel/detail/platform_linux/layer_tun.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ struct layer_tun : public Super

Super::ioctl(m_tun_fd, TUNSETIFF, (void*)&ifr, error);

Super::do_log(log_level::state, log_kind::interface_created,
Super::do_log(log_level::debug, log_kind::interface_created,
log::str{"name", interface_name.c_str()});
}

Expand All @@ -108,7 +108,7 @@ struct layer_tun : public Super

std::string o = read_property("owner", error);

Super::do_log(log_level::state, log_kind::owner,
Super::do_log(log_level::debug, log_kind::owner,
log::str{"owner", o.c_str()});

if (error)
Expand Down Expand Up @@ -140,7 +140,7 @@ struct layer_tun : public Super
assert(!error);
assert(!owner.empty());

Super::do_log(log_level::state, log_kind::set_owner,
Super::do_log(log_level::debug, log_kind::set_owner,
log::str{"owner", owner.c_str()});

struct passwd* pwd = getpwnam(owner.c_str());
Expand All @@ -159,7 +159,7 @@ struct layer_tun : public Super
{
std::string o = read_property("group", error);

Super::do_log(log_level::state, log_kind::group,
Super::do_log(log_level::debug, log_kind::group,
log::str{"group", o.c_str()});

if (error)
Expand Down Expand Up @@ -192,7 +192,7 @@ struct layer_tun : public Super
assert(!group.empty());
assert(m_tun_fd);

Super::do_log(log_level::state, log_kind::set_group,
Super::do_log(log_level::debug, log_kind::set_group,
log::str{"group", group.c_str()});

struct group* grp = getgrnam(group.c_str());
Expand All @@ -219,7 +219,7 @@ struct layer_tun : public Super

bool persistent = ifr.ifr_flags & IFF_PERSIST;

Super::do_log(log_level::state, log_kind::interface_is_persistent,
Super::do_log(log_level::debug, log_kind::interface_is_persistent,
log::boolean{"persistent", persistent});
return persistent;
}
Expand All @@ -229,7 +229,7 @@ struct layer_tun : public Super
assert(m_tun_fd);
assert(!error);

Super::do_log(log_level::state, log_kind::set_persistent,
Super::do_log(log_level::debug, log_kind::set_persistent,
log::str{"", ""});

Super::ioctl(m_tun_fd, TUNSETPERSIST, (void*)1, error);
Expand All @@ -240,7 +240,7 @@ struct layer_tun : public Super
assert(m_tun_fd);
assert(!error);

Super::do_log(log_level::state, log_kind::set_non_persistent,
Super::do_log(log_level::debug, log_kind::set_non_persistent,
log::str{"", ""});

Super::ioctl(m_tun_fd, TUNSETPERSIST, (void*)0, error);
Expand All @@ -256,7 +256,7 @@ struct layer_tun : public Super
};
Super::ioctl(m_tun_fd, TUNGETIFF, (void*)&ifr, error);

Super::do_log(log_level::state, log_kind::interface_name,
Super::do_log(log_level::debug, log_kind::interface_name,
log::str{"name", ifr.ifr_name});

return ifr.ifr_name;
Expand All @@ -266,7 +266,7 @@ struct layer_tun : public Super
{
assert(m_tun_fd);

Super::do_log(log_level::state, log_kind::native_handle,
Super::do_log(log_level::debug, log_kind::native_handle,
log::integer{"handle", m_tun_fd.native_handle()});

return m_tun_fd.native_handle();
Expand Down

0 comments on commit 9ddbe6e

Please sign in to comment.