-
Notifications
You must be signed in to change notification settings - Fork 274
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes in swss-common submodule to support NAT feature. #304
Changes from 4 commits
f4d37fb
921de81
8af5cc2
94201c8
8facdd4
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,209 @@ | ||
#include <string.h> | ||
#include <errno.h> | ||
#include <system_error> | ||
#include "common/logger.h" | ||
#include "common/netmsg.h" | ||
#include "common/netdispatcher.h" | ||
#include "common/netlink.h" | ||
#include "common/nfnetlink.h" | ||
|
||
using namespace swss; | ||
using namespace std; | ||
|
||
NfNetlink::NfNetlink(int pri) : | ||
Selectable(pri) | ||
{ | ||
m_socket = nl_socket_alloc(); | ||
if (!m_socket) | ||
{ | ||
SWSS_LOG_ERROR("Unable to allocated nfnetlink socket"); | ||
throw system_error(make_error_code(errc::address_not_available), | ||
"Unable to allocate nfnetlink socket"); | ||
} | ||
|
||
nl_socket_disable_seq_check(m_socket); | ||
nl_socket_disable_auto_ack(m_socket); | ||
|
||
int err = nfnl_connect(m_socket); | ||
if (err < 0) | ||
{ | ||
SWSS_LOG_ERROR("Unable to connect nfnetlink socket: %s", nl_geterror(err)); | ||
nl_socket_free(m_socket); | ||
m_socket = NULL; | ||
throw system_error(make_error_code(errc::address_not_available), | ||
"Unable to connect nfnetlink socket"); | ||
} | ||
|
||
nl_socket_set_nonblocking(m_socket); | ||
|
||
/* Set socket buffer size to 10 MB */ | ||
nl_socket_set_buffer_size(m_socket, 10485760, 0); | ||
|
||
#ifdef NETFILTER_UNIT_TEST | ||
/* For netlink packet tracing purposes */ | ||
nfPktsLogFile = fopen("/var/log/nf_netlink_pkts.log", "w"); | ||
if (nfPktsLogFile == NULL) | ||
{ | ||
SWSS_LOG_ERROR("Unable to open netfilter netlink packets log file: %s", strerror(errno)); | ||
} | ||
#endif | ||
} | ||
|
||
NfNetlink::~NfNetlink() | ||
{ | ||
if (m_socket != NULL) | ||
{ | ||
nl_close(m_socket); | ||
nl_socket_free(m_socket); | ||
} | ||
} | ||
|
||
void NfNetlink::registerRecvCallbacks(void) | ||
{ | ||
#ifdef NETFILTER_UNIT_TEST | ||
nl_socket_modify_cb(m_socket, NL_CB_MSG_IN, NL_CB_CUSTOM, onNetlinkRcv, this); | ||
#endif | ||
|
||
nl_socket_modify_cb(m_socket, NL_CB_VALID, NL_CB_CUSTOM, onNetlinkMsg, this); | ||
} | ||
|
||
void NfNetlink::registerGroup(int nfnlGroup) | ||
{ | ||
int err = nl_socket_add_membership(m_socket, nfnlGroup); | ||
if (err < 0) | ||
{ | ||
SWSS_LOG_ERROR("Unable to register to netfilter group %d: %s", nfnlGroup, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is it better to use SWSS_LOG_THROW - shortcut to log error and to throw? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done |
||
nl_geterror(err)); | ||
throw system_error(make_error_code(errc::address_not_available), | ||
"Unable to register to netfilter group"); | ||
} | ||
} | ||
void NfNetlink::dumpRequest(int getCommand) | ||
{ | ||
int err = nfnl_ct_dump_request(m_socket); | ||
if (err < 0) | ||
{ | ||
SWSS_LOG_ERROR("Unable to request netfilter conntrack dump: %s", | ||
nl_geterror(err)); | ||
throw system_error(make_error_code(errc::address_not_available), | ||
"Unable to request netfilter conntrack dump"); | ||
} | ||
} | ||
|
||
void NfNetlink::updateConnTrackEntry(struct nfnl_ct *ct) | ||
{ | ||
if (nfnl_ct_add(m_socket, ct, NLM_F_REPLACE) < 0) | ||
{ | ||
SWSS_LOG_ERROR("Failed to update conntrack object in the kernel"); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Suggest to SWSS_LOG_THROW or even better return a boolean whether API succeeded or not? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done |
||
} | ||
} | ||
|
||
void NfNetlink::deleteConnTrackEntry(struct nfnl_ct *ct) | ||
{ | ||
if (nfnl_ct_del(m_socket, ct, 0) < 0) | ||
{ | ||
SWSS_LOG_ERROR("Failed to delete conntrack object in the kernel"); | ||
} | ||
} | ||
|
||
struct nfnl_ct *NfNetlink::getCtObject(const IpAddress &sourceIpAddr) | ||
{ | ||
struct nfnl_ct *ct = nfnl_ct_alloc(); | ||
struct nl_addr *orig_src_ip; | ||
|
||
if (! ct) | ||
{ | ||
SWSS_LOG_ERROR("Unable to allocate memory for conntrack object"); | ||
return NULL; | ||
} | ||
|
||
nfnl_ct_set_family(ct, AF_INET); | ||
if (nl_addr_parse(sourceIpAddr.to_string().c_str(), AF_INET, &orig_src_ip) == 0) | ||
{ | ||
nfnl_ct_set_src(ct, 0, orig_src_ip); | ||
} | ||
else | ||
{ | ||
SWSS_LOG_ERROR("Failed to parse orig src ip into conntrack object"); | ||
nfnl_ct_put(ct); | ||
return NULL; | ||
} | ||
|
||
return ct; | ||
} | ||
|
||
struct nfnl_ct *NfNetlink::getCtObject(uint8_t protoType, const IpAddress &sourceIpAddr, uint16_t srcPort) | ||
{ | ||
struct nfnl_ct *ct = nfnl_ct_alloc(); | ||
struct nl_addr *orig_src_ip; | ||
|
||
if (! ct) | ||
{ | ||
SWSS_LOG_ERROR("Unable to allocate memory for conntrack object"); | ||
return NULL; | ||
} | ||
|
||
nfnl_ct_set_family(ct, AF_INET); | ||
nfnl_ct_set_proto(ct, protoType); | ||
|
||
if (nl_addr_parse(sourceIpAddr.to_string().c_str(), AF_INET, &orig_src_ip) == 0) | ||
{ | ||
nfnl_ct_set_src(ct, 0, orig_src_ip); | ||
} | ||
else | ||
{ | ||
SWSS_LOG_ERROR("Failed to parse orig src ip into conntrack object"); | ||
nfnl_ct_put(ct); | ||
return NULL; | ||
} | ||
nfnl_ct_set_src_port(ct, 0, srcPort); | ||
|
||
return ct; | ||
} | ||
|
||
int NfNetlink::getFd() | ||
{ | ||
return nl_socket_get_fd(m_socket); | ||
} | ||
|
||
uint64_t NfNetlink::readData() | ||
{ | ||
int err; | ||
|
||
do | ||
{ | ||
err = nl_recvmsgs_default(m_socket); | ||
} | ||
while(err == -NLE_INTR); // Retry if the process was interrupted by a signal | ||
|
||
if (err < 0) | ||
{ | ||
if (err == -NLE_NOMEM) | ||
SWSS_LOG_ERROR("netlink reports out of memory on reading a netfilter netlink socket. High possiblity of a lost message"); | ||
else if (err == -NLE_AGAIN) | ||
SWSS_LOG_DEBUG("netlink reports NLE_AGAIN on reading a netfilter netlink socket"); | ||
else | ||
SWSS_LOG_ERROR("netlink reports an error=%d on reading a netfilter netlink socket", err); | ||
} | ||
return 0; | ||
} | ||
|
||
int NfNetlink::onNetlinkMsg(struct nl_msg *msg, void *arg) | ||
{ | ||
NetDispatcher::getInstance().onNetlinkMessage(msg); | ||
return NL_OK; | ||
} | ||
|
||
#ifdef NETFILTER_UNIT_TEST | ||
int NfNetlink::onNetlinkRcv(struct nl_msg *msg, void *arg) | ||
{ | ||
NfNetlink *nfnlink = (NfNetlink *)arg; | ||
|
||
if ((nfnlink == NULL) || (nfnlink->nfPktsLogFile == NULL)) | ||
return NL_OK; | ||
|
||
nl_msg_dump(msg, nfnlink->nfPktsLogFile); | ||
|
||
return NL_OK; | ||
} | ||
#endif |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
#ifndef __NFNETLINK__ | ||
#define __NFNETLINK__ | ||
|
||
#include "ipaddress.h" | ||
#include <netlink/netfilter/ct.h> | ||
#include <netlink/netfilter/nfnl.h> | ||
|
||
namespace swss { | ||
|
||
class NfNetlink : public Selectable { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. A lot of code duplicates Netlink class, did you consider to inherit from Netlink? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Inheriting from Netlink class was considered, but the Netlink class is specific to NETLINK_ROUTE and initializes m_socket member to route socket in its constructor. But NfNetlink class is specific to NETFILTER socket and Netlink class constructor invocation would result in unnecessary calls specific Route socket. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think the difference is not big, one thing you can do is to define virtual private "connect" method and override it for NfNetlink to call nfnl_connect. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @stepanblyschak Are you saying, we have connect() as virtual function which is overridden by derived NfNetlink class, and call connect() in NetLink() construtor in the place of nl_connect() in the current code? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ok, you're correct |
||
public: | ||
NfNetlink(int pri = 0); | ||
~NfNetlink() override; | ||
|
||
void registerRecvCallbacks(void); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Could you please remove void parameter?. Seems it is legacy from C-code and in this file such style is not used expect this method There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done |
||
void registerGroup(int nfnlGroup); | ||
void dumpRequest(int getCommand); | ||
|
||
int getFd() override; | ||
uint64_t readData() override; | ||
|
||
void updateConnTrackEntry(struct nfnl_ct *ct); | ||
void deleteConnTrackEntry(struct nfnl_ct *ct); | ||
|
||
private: | ||
struct nfnl_ct *getCtObject(const IpAddress &sourceIpAddr); | ||
struct nfnl_ct *getCtObject(uint8_t protoType, const IpAddress &sourceIpAddr, uint16_t srcPort); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. These are private and not used here? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Were added initially during development, now these can be removed. Good catch. |
||
|
||
static int onNetlinkRcv(struct nl_msg *msg, void *arg); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. put onNetlinkRcv declaration in #ifdef NETFILTER_UNIT_TEST There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done |
||
static int onNetlinkMsg(struct nl_msg *msg, void *arg); | ||
|
||
FILE *nfPktsLogFile; | ||
nl_sock *m_socket; | ||
}; | ||
|
||
} | ||
|
||
#endif /* __NFNETLINK__ */ | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Make the buffer configurable from class user?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
added an API to the class for setting the send/recv socket buffer size.