From: Victor Julien Date: Fri, 12 Jun 2020 10:14:01 +0000 (+0200) Subject: reject: remove L3 from function names X-Git-Tag: suricata-6.0.0-beta1~310 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=279865b145e4d4feef6df0a156ffa94d010137bb;p=thirdparty%2Fsuricata.git reject: remove L3 from function names --- diff --git a/src/respond-reject-libnet11.c b/src/respond-reject-libnet11.c index a4f3ab1ab7..fe7e7bdf43 100644 --- a/src/respond-reject-libnet11.c +++ b/src/respond-reject-libnet11.c @@ -263,7 +263,7 @@ static inline int BuildEthernet(libnet_t *c, Libnet11Packet *lpacket, uint16_t p return 0; } -int RejectSendLibnet11L3IPv4TCP(ThreadVars *tv, Packet *p, void *data, int dir) +int RejectSendLibnet11IPv4TCP(ThreadVars *tv, Packet *p, void *data, int dir) { Libnet11Packet lpacket; int result; @@ -322,7 +322,7 @@ cleanup: return 0; } -int RejectSendLibnet11L3IPv4ICMP(ThreadVars *tv, Packet *p, void *data, int dir) +int RejectSendLibnet11IPv4ICMP(ThreadVars *tv, Packet *p, void *data, int dir) { Libnet11Packet lpacket; int result; @@ -390,7 +390,7 @@ cleanup: return 0; } -int RejectSendLibnet11L3IPv6TCP(ThreadVars *tv, Packet *p, void *data, int dir) +int RejectSendLibnet11IPv6TCP(ThreadVars *tv, Packet *p, void *data, int dir) { Libnet11Packet lpacket; int result; @@ -449,7 +449,7 @@ cleanup: } #ifdef HAVE_LIBNET_ICMPV6_UNREACH -int RejectSendLibnet11L3IPv6ICMP(ThreadVars *tv, Packet *p, void *data, int dir) +int RejectSendLibnet11IPv6ICMP(ThreadVars *tv, Packet *p, void *data, int dir) { Libnet11Packet lpacket; int result; @@ -519,7 +519,7 @@ cleanup: #else /* HAVE_LIBNET_ICMPV6_UNREACH */ -int RejectSendLibnet11L3IPv6ICMP(ThreadVars *tv, Packet *p, void *data, int dir) +int RejectSendLibnet11IPv6ICMP(ThreadVars *tv, Packet *p, void *data, int dir) { SCLogError(SC_ERR_LIBNET_NOT_ENABLED, "Libnet ICMPv6 based rejects are disabled." "Usually this means that you don't have a patched libnet installed," @@ -531,7 +531,7 @@ int RejectSendLibnet11L3IPv6ICMP(ThreadVars *tv, Packet *p, void *data, int dir) #else -int RejectSendLibnet11L3IPv4TCP(ThreadVars *tv, Packet *p, void *data, int dir) +int RejectSendLibnet11IPv4TCP(ThreadVars *tv, Packet *p, void *data, int dir) { SCLogError(SC_ERR_LIBNET_NOT_ENABLED, "Libnet based rejects are disabled." "Usually this means that you don't have libnet installed," @@ -539,7 +539,7 @@ int RejectSendLibnet11L3IPv4TCP(ThreadVars *tv, Packet *p, void *data, int dir) return 0; } -int RejectSendLibnet11L3IPv4ICMP(ThreadVars *tv, Packet *p, void *data, int dir) +int RejectSendLibnet11IPv4ICMP(ThreadVars *tv, Packet *p, void *data, int dir) { SCLogError(SC_ERR_LIBNET_NOT_ENABLED, "Libnet based rejects are disabled." "Usually this means that you don't have libnet installed," @@ -547,7 +547,7 @@ int RejectSendLibnet11L3IPv4ICMP(ThreadVars *tv, Packet *p, void *data, int dir) return 0; } -int RejectSendLibnet11L3IPv6TCP(ThreadVars *tv, Packet *p, void *data, int dir) +int RejectSendLibnet11IPv6TCP(ThreadVars *tv, Packet *p, void *data, int dir) { SCLogError(SC_ERR_LIBNET_NOT_ENABLED, "Libnet based rejects are disabled." "Usually this means that you don't have libnet installed," @@ -555,7 +555,7 @@ int RejectSendLibnet11L3IPv6TCP(ThreadVars *tv, Packet *p, void *data, int dir) return 0; } -int RejectSendLibnet11L3IPv6ICMP(ThreadVars *tv, Packet *p, void *data, int dir) +int RejectSendLibnet11IPv6ICMP(ThreadVars *tv, Packet *p, void *data, int dir) { SCLogError(SC_ERR_LIBNET_NOT_ENABLED, "Libnet based rejects are disabled." "Usually this means that you don't have libnet installed," diff --git a/src/respond-reject-libnet11.h b/src/respond-reject-libnet11.h index f7ffab98b7..7535eaa388 100644 --- a/src/respond-reject-libnet11.h +++ b/src/respond-reject-libnet11.h @@ -25,11 +25,11 @@ #ifndef __RESPOND_REJECT_LIBNET11_H__ #define __RESPOND_REJECT_LIBNET11_H__ -int RejectSendLibnet11L3IPv4TCP(ThreadVars *, Packet *, void *,int); -int RejectSendLibnet11L3IPv4ICMP(ThreadVars *, Packet *, void *,int); +int RejectSendLibnet11IPv4TCP(ThreadVars *, Packet *, void *,int); +int RejectSendLibnet11IPv4ICMP(ThreadVars *, Packet *, void *,int); -int RejectSendLibnet11L3IPv6TCP(ThreadVars *, Packet *, void *,int); -int RejectSendLibnet11L3IPv6ICMP(ThreadVars *, Packet *, void *,int); +int RejectSendLibnet11IPv6TCP(ThreadVars *, Packet *, void *,int); +int RejectSendLibnet11IPv6ICMP(ThreadVars *, Packet *, void *,int); void FreeCachedCtx(void); diff --git a/src/respond-reject.c b/src/respond-reject.c index b454f61060..4d3308d6de 100644 --- a/src/respond-reject.c +++ b/src/respond-reject.c @@ -94,14 +94,14 @@ int RejectSendIPv4TCP(ThreadVars *tv, Packet *p, void *data) { SCEnter(); if (PACKET_TEST_ACTION(p, ACTION_REJECT)) { - int r = RejectSendLibnet11L3IPv4TCP(tv, p, data, REJECT_DIR_SRC); + int r = RejectSendLibnet11IPv4TCP(tv, p, data, REJECT_DIR_SRC); SCReturnInt(r); } else if (PACKET_TEST_ACTION(p, ACTION_REJECT_DST)) { - int r = RejectSendLibnet11L3IPv4TCP(tv, p, data, REJECT_DIR_DST); + int r = RejectSendLibnet11IPv4TCP(tv, p, data, REJECT_DIR_DST); SCReturnInt(r); } else if(PACKET_TEST_ACTION(p, ACTION_REJECT_BOTH)) { - int r = RejectSendLibnet11L3IPv4TCP(tv, p, data, REJECT_DIR_SRC); - if (RejectSendLibnet11L3IPv4TCP(tv, p, data, REJECT_DIR_DST) == 0) { + int r = RejectSendLibnet11IPv4TCP(tv, p, data, REJECT_DIR_SRC); + if (RejectSendLibnet11IPv4TCP(tv, p, data, REJECT_DIR_DST) == 0) { SCReturnInt(0); } else { SCReturnInt(r); @@ -114,15 +114,15 @@ int RejectSendIPv4ICMP(ThreadVars *tv, Packet *p, void *data) { SCEnter(); if (PACKET_TEST_ACTION(p, ACTION_REJECT)) { - int r = RejectSendLibnet11L3IPv4ICMP(tv, p, data, REJECT_DIR_SRC); + int r = RejectSendLibnet11IPv4ICMP(tv, p, data, REJECT_DIR_SRC); SCReturnInt(r); } else if (PACKET_TEST_ACTION(p, ACTION_REJECT_DST)) { - int r = RejectSendLibnet11L3IPv4ICMP(tv, p, data, REJECT_DIR_DST); + int r = RejectSendLibnet11IPv4ICMP(tv, p, data, REJECT_DIR_DST); SCReturnInt(r); } else if(PACKET_TEST_ACTION(p, ACTION_REJECT_BOTH)) { int r; - r = RejectSendLibnet11L3IPv4ICMP(tv, p, data, REJECT_DIR_SRC); - if (RejectSendLibnet11L3IPv4ICMP(tv, p, data, REJECT_DIR_DST) == 0) { + r = RejectSendLibnet11IPv4ICMP(tv, p, data, REJECT_DIR_SRC); + if (RejectSendLibnet11IPv4ICMP(tv, p, data, REJECT_DIR_DST) == 0) { SCReturnInt(0); } else { SCReturnInt(r); @@ -135,14 +135,14 @@ int RejectSendIPv6TCP(ThreadVars *tv, Packet *p, void *data) { SCEnter(); if (PACKET_TEST_ACTION(p, ACTION_REJECT)) { - int r = RejectSendLibnet11L3IPv6TCP(tv, p, data, REJECT_DIR_SRC); + int r = RejectSendLibnet11IPv6TCP(tv, p, data, REJECT_DIR_SRC); SCReturnInt(r); } else if (PACKET_TEST_ACTION(p, ACTION_REJECT_DST)) { - int r = RejectSendLibnet11L3IPv6TCP(tv, p, data, REJECT_DIR_DST); + int r = RejectSendLibnet11IPv6TCP(tv, p, data, REJECT_DIR_DST); SCReturnInt(r); } else if(PACKET_TEST_ACTION(p, ACTION_REJECT_BOTH)) { - int r = RejectSendLibnet11L3IPv6TCP(tv, p, data, REJECT_DIR_SRC); - if (RejectSendLibnet11L3IPv6TCP(tv, p, data, REJECT_DIR_DST) == 0) { + int r = RejectSendLibnet11IPv6TCP(tv, p, data, REJECT_DIR_SRC); + if (RejectSendLibnet11IPv6TCP(tv, p, data, REJECT_DIR_DST) == 0) { SCReturnInt(0); } else { SCReturnInt(r); @@ -155,14 +155,14 @@ int RejectSendIPv6ICMP(ThreadVars *tv, Packet *p, void *data) { SCEnter(); if (PACKET_TEST_ACTION(p, ACTION_REJECT)) { - int r = RejectSendLibnet11L3IPv6ICMP(tv, p, data, REJECT_DIR_SRC); + int r = RejectSendLibnet11IPv6ICMP(tv, p, data, REJECT_DIR_SRC); SCReturnInt(r); } else if (PACKET_TEST_ACTION(p, ACTION_REJECT_DST)) { - int r = RejectSendLibnet11L3IPv6ICMP(tv, p, data, REJECT_DIR_DST); + int r = RejectSendLibnet11IPv6ICMP(tv, p, data, REJECT_DIR_DST); SCReturnInt(r); } else if(PACKET_TEST_ACTION(p, ACTION_REJECT_BOTH)) { - int r = RejectSendLibnet11L3IPv6ICMP(tv, p, data, REJECT_DIR_SRC); - if (RejectSendLibnet11L3IPv6ICMP(tv, p, data, REJECT_DIR_DST) == 0) { + int r = RejectSendLibnet11IPv6ICMP(tv, p, data, REJECT_DIR_SRC); + if (RejectSendLibnet11IPv6ICMP(tv, p, data, REJECT_DIR_DST) == 0) { SCReturnInt(0); } else { SCReturnInt(r);