Date: Sun, 30 May 2021 19:26:30 GMT From: Lutz Donnerhacke <donner@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 8e77442a5a53 - stable/12 - liblias: clean up empty lines in .c and .h files Message-ID: <202105301926.14UJQUah021297@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by donner: URL: https://cgit.FreeBSD.org/src/commit/?id=8e77442a5a53450d509004c7b09ccc0b82f4eaca commit 8e77442a5a53450d509004c7b09ccc0b82f4eaca Author: Mateusz Guzik <mjg@FreeBSD.org> AuthorDate: 2021-05-30 19:12:53 +0000 Commit: Lutz Donnerhacke <donner@FreeBSD.org> CommitDate: 2021-05-30 19:16:30 +0000 liblias: clean up empty lines in .c and .h files Partial apply of a huge commit to libalias only (cherry picked from commit 662c13053f4bf2d6245ba7e2b66c10d1cd5c1fb9) --- sys/netinet/libalias/alias.c | 25 ------------ sys/netinet/libalias/alias.h | 1 - sys/netinet/libalias/alias_db.c | 79 +++---------------------------------- sys/netinet/libalias/alias_dummy.c | 3 +- sys/netinet/libalias/alias_ftp.c | 2 - sys/netinet/libalias/alias_irc.c | 1 - sys/netinet/libalias/alias_local.h | 9 ++--- sys/netinet/libalias/alias_nbt.c | 9 ++--- sys/netinet/libalias/alias_pptp.c | 5 +-- sys/netinet/libalias/alias_proxy.c | 8 ---- sys/netinet/libalias/alias_sctp.c | 10 ----- sys/netinet/libalias/alias_sctp.h | 8 ---- sys/netinet/libalias/alias_skinny.c | 3 +- sys/netinet/libalias/alias_smedia.c | 11 +----- sys/netinet/libalias/alias_util.c | 1 - 15 files changed, 17 insertions(+), 158 deletions(-) diff --git a/sys/netinet/libalias/alias.c b/sys/netinet/libalias/alias.c index f9261e394157..4dfe65d29f6a 100644 --- a/sys/netinet/libalias/alias.c +++ b/sys/netinet/libalias/alias.c @@ -188,7 +188,6 @@ static void TcpMonitorIn(u_char, struct alias_link *); static void TcpMonitorOut(u_char, struct alias_link *); - static void TcpMonitorIn(u_char th_flags, struct alias_link *lnk) { @@ -225,10 +224,6 @@ TcpMonitorOut(u_char th_flags, struct alias_link *lnk) } } - - - - /* Protocol Specific Packet Aliasing Routines IcmpAliasIn(), IcmpAliasIn1(), IcmpAliasIn2() @@ -268,7 +263,6 @@ All packets go through the aliasing mechanism, whether they come from the gateway machine or other machines on a local area network. */ - /* Local prototypes */ static int IcmpAliasIn1(struct libalias *, struct ip *); static int IcmpAliasIn2(struct libalias *, struct ip *); @@ -290,7 +284,6 @@ static int UdpAliasOut(struct libalias *, struct ip *, int, int create); static int TcpAliasIn(struct libalias *, struct ip *); static int TcpAliasOut(struct libalias *, struct ip *, int, int create); - static int IcmpAliasIn1(struct libalias *la, struct ip *pip) { @@ -437,7 +430,6 @@ fragment contained in ICMP data section */ return (PKT_ALIAS_IGNORED); } - static int IcmpAliasIn(struct libalias *la, struct ip *pip) { @@ -482,7 +474,6 @@ IcmpAliasIn(struct libalias *la, struct ip *pip) return (iresult); } - static int IcmpAliasOut1(struct libalias *la, struct ip *pip, int create) { @@ -527,7 +518,6 @@ IcmpAliasOut1(struct libalias *la, struct ip *pip, int create) return (PKT_ALIAS_IGNORED); } - static int IcmpAliasOut2(struct libalias *la, struct ip *pip) { @@ -628,7 +618,6 @@ fragment contained in ICMP data section */ return (PKT_ALIAS_IGNORED); } - static int IcmpAliasOut(struct libalias *la, struct ip *pip, int create) { @@ -734,7 +723,6 @@ ProtoAliasOut(struct libalias *la, struct ip *pip, return (PKT_ALIAS_IGNORED); } - static int UdpAliasIn(struct libalias *la, struct ip *pip) { @@ -938,8 +926,6 @@ UdpAliasOut(struct libalias *la, struct ip *pip, int maxpacketsize, int create) return (PKT_ALIAS_IGNORED); } - - static int TcpAliasIn(struct libalias *la, struct ip *pip) { @@ -1187,9 +1173,6 @@ TcpAliasOut(struct libalias *la, struct ip *pip, int maxpacketsize, int create) return (PKT_ALIAS_IGNORED); } - - - /* Fragment Handling FragmentIn() @@ -1244,11 +1227,6 @@ FragmentOut(struct libalias *la, struct ip *pip, u_short *ip_sum) return (PKT_ALIAS_OK); } - - - - - /* Outside World Access PacketAliasSaveFragment() @@ -1429,8 +1407,6 @@ getout: return (iresult); } - - /* Unregistered address ranges */ /* 10.0.0.0 -> 10.255.255.255 */ @@ -1648,7 +1624,6 @@ LibAliasUnaliasOut(struct libalias *la, void *ptr, /* valid IP packet */ iresult = PKT_ALIAS_OK; } else if (pip->ip_p == IPPROTO_ICMP) { - int accumulate; struct in_addr original_address; u_short original_id; diff --git a/sys/netinet/libalias/alias.h b/sys/netinet/libalias/alias.h index e712fb41628c..91351a9eb8b9 100644 --- a/sys/netinet/libalias/alias.h +++ b/sys/netinet/libalias/alias.h @@ -145,7 +145,6 @@ struct mbuf *m_megapullup(struct mbuf *, int); * Mode flags and other constants. */ - /* Mode flags, set using PacketAliasSetMode() */ /* diff --git a/sys/netinet/libalias/alias_db.c b/sys/netinet/libalias/alias_db.c index 4569a9dec122..d444858c6cfc 100644 --- a/sys/netinet/libalias/alias_db.c +++ b/sys/netinet/libalias/alias_db.c @@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$"); there is an incomplete connection, in which case the link can be deleted after a certain amount of time. - Initial version: August, 1996 (cjm) Version 1.4: September 16, 1996 (cjm) @@ -178,7 +177,6 @@ __FBSDID("$FreeBSD$"); static LIST_HEAD(, libalias) instancehead = LIST_HEAD_INITIALIZER(instancehead); - /* Constants (note: constants are also defined near relevant functions or structs) @@ -219,7 +217,6 @@ static LIST_HEAD(, libalias) instancehead = LIST_HEAD_INITIALIZER(instancehead) #define TCP_EXPIRE_CONNECTED 86400 #endif - /* Dummy port number codes used for FindLinkIn/Out() and AddLink(). These constants can be anything except zero, which indicates an unknown port number. */ @@ -227,8 +224,6 @@ static LIST_HEAD(, libalias) instancehead = LIST_HEAD_INITIALIZER(instancehead) #define NO_DEST_PORT 1 #define NO_SRC_PORT 1 - - /* Data Structures The fundamental data structure used in this program is @@ -383,7 +378,6 @@ Miscellaneous: ShowAliasStats() -- send alias statistics to a monitor file */ - /* Local prototypes */ static u_int StartPointIn(struct in_addr, u_short, int); @@ -422,7 +416,6 @@ StartPointIn(struct in_addr alias_addr, return (n % LINK_TABLE_IN_SIZE); } - static u_int StartPointOut(struct in_addr src_addr, struct in_addr dst_addr, u_short src_port, u_short dst_port, int link_type) @@ -440,7 +433,6 @@ StartPointOut(struct in_addr src_addr, struct in_addr dst_addr, return (n % LINK_TABLE_OUT_SIZE); } - static int SeqDiff(u_long x, u_long y) { @@ -460,7 +452,7 @@ static void AliasLog(char *str, const char *format, ...) { va_list ap; - + va_start(ap, format); vsnprintf(str, LIBALIAS_BUF_SIZE, format, ap); va_end(ap); @@ -470,7 +462,7 @@ static void AliasLog(FILE *stream, const char *format, ...) { va_list ap; - + va_start(ap, format); vfprintf(stream, format, ap); va_end(ap); @@ -513,7 +505,6 @@ void SctpShowAliasStats(struct libalias *la) ShowAliasStats(la); } - /* Internal routines for finding, deleting and adding links Port Allocation: @@ -557,7 +548,6 @@ static struct alias_link * static struct alias_link * FindLinkIn (struct libalias *, struct in_addr, struct in_addr, u_short, u_short, int, int); - #define ALIAS_PORT_BASE 0x08000 #define ALIAS_PORT_MASK 0x07fff #define ALIAS_PORT_MASK_EVEN 0x07ffe @@ -627,7 +617,6 @@ GetNewPort(struct libalias *la, struct alias_link *lnk, int alias_port_param) return (-1); } - /* Port number search */ for (i = 0; i < max_trials; i++) { int go_ahead; @@ -781,7 +770,6 @@ FindNewPortGroup(struct libalias *la, port_sys = ntohs(src_port); } else { - /* First trial and all subsequent are random. */ if (align == FIND_EVEN_ALIAS_BASE) port_sys = arc4random() & ALIAS_PORT_MASK_EVEN; @@ -793,7 +781,6 @@ FindNewPortGroup(struct libalias *la, /* Port number search */ for (i = 0; i < max_trials; i++) { - struct alias_link *search_result; for (j = 0; j < port_count; j++) @@ -842,7 +829,6 @@ CleanupAliasData(struct libalias *la) la->cleanupIndex = 0; } - static void IncrementalCleanup(struct libalias *la) { @@ -935,7 +921,6 @@ DeleteLink(struct alias_link *lnk) } } - struct alias_link * AddLink(struct libalias *la, struct in_addr src_addr, struct in_addr dst_addr, struct in_addr alias_addr, u_short src_port, u_short dst_port, @@ -1180,7 +1165,6 @@ FindLinkOut(struct libalias *la, struct in_addr src_addr, return (lnk); } - static struct alias_link * _FindLinkIn(struct libalias *la, struct in_addr dst_addr, struct in_addr alias_addr, @@ -1255,8 +1239,6 @@ _FindLinkIn(struct libalias *la, struct in_addr dst_addr, } } - - if (lnk_fully_specified != NULL) { lnk_fully_specified->timestamp = la->timeStamp; lnk = lnk_fully_specified; @@ -1326,9 +1308,6 @@ FindLinkIn(struct libalias *la, struct in_addr dst_addr, return (lnk); } - - - /* External routines for finding/adding links -- "external" means outside alias_db.c, but within alias*.c -- @@ -1345,7 +1324,6 @@ FindLinkIn(struct libalias *la, struct in_addr dst_addr, (prototypes in alias_local.h) */ - struct alias_link * FindIcmpIn(struct libalias *la, struct in_addr dst_addr, struct in_addr alias_addr, @@ -1369,7 +1347,6 @@ FindIcmpIn(struct libalias *la, struct in_addr dst_addr, return (lnk); } - struct alias_link * FindIcmpOut(struct libalias *la, struct in_addr src_addr, struct in_addr dst_addr, @@ -1393,7 +1370,6 @@ FindIcmpOut(struct libalias *la, struct in_addr src_addr, return (lnk); } - struct alias_link * FindFragmentIn1(struct libalias *la, struct in_addr dst_addr, struct in_addr alias_addr, @@ -1414,21 +1390,19 @@ FindFragmentIn1(struct libalias *la, struct in_addr dst_addr, return (lnk); } - struct alias_link * FindFragmentIn2(struct libalias *la, struct in_addr dst_addr, /* Doesn't add a link if * one */ struct in_addr alias_addr, /* is not found. */ u_short ip_id) { - + LIBALIAS_LOCK_ASSERT(la); return FindLinkIn(la, dst_addr, alias_addr, NO_DEST_PORT, ip_id, LINK_FRAGMENT_ID, 0); } - struct alias_link * AddFragmentPtrLink(struct libalias *la, struct in_addr dst_addr, u_short ip_id) @@ -1440,7 +1414,6 @@ AddFragmentPtrLink(struct libalias *la, struct in_addr dst_addr, LINK_FRAGMENT_PTR); } - struct alias_link * FindFragmentPtr(struct libalias *la, struct in_addr dst_addr, u_short ip_id) @@ -1452,7 +1425,6 @@ FindFragmentPtr(struct libalias *la, struct in_addr dst_addr, LINK_FRAGMENT_PTR, 0); } - struct alias_link * FindProtoIn(struct libalias *la, struct in_addr dst_addr, struct in_addr alias_addr, @@ -1476,7 +1448,6 @@ FindProtoIn(struct libalias *la, struct in_addr dst_addr, return (lnk); } - struct alias_link * FindProtoOut(struct libalias *la, struct in_addr src_addr, struct in_addr dst_addr, @@ -1500,7 +1471,6 @@ FindProtoOut(struct libalias *la, struct in_addr src_addr, return (lnk); } - struct alias_link * FindUdpTcpIn(struct libalias *la, struct in_addr dst_addr, struct in_addr alias_addr, @@ -1540,7 +1510,6 @@ FindUdpTcpIn(struct libalias *la, struct in_addr dst_addr, return (lnk); } - struct alias_link * FindUdpTcpOut(struct libalias *la, struct in_addr src_addr, struct in_addr dst_addr, @@ -1578,7 +1547,6 @@ FindUdpTcpOut(struct libalias *la, struct in_addr src_addr, return (lnk); } - struct alias_link * AddPptp(struct libalias *la, struct in_addr src_addr, struct in_addr dst_addr, @@ -1595,7 +1563,6 @@ AddPptp(struct libalias *la, struct in_addr src_addr, return (lnk); } - struct alias_link * FindPptpOutByCallId(struct libalias *la, struct in_addr src_addr, struct in_addr dst_addr, @@ -1616,7 +1583,6 @@ FindPptpOutByCallId(struct libalias *la, struct in_addr src_addr, return (lnk); } - struct alias_link * FindPptpOutByPeerCallId(struct libalias *la, struct in_addr src_addr, struct in_addr dst_addr, @@ -1637,7 +1603,6 @@ FindPptpOutByPeerCallId(struct libalias *la, struct in_addr src_addr, return (lnk); } - struct alias_link * FindPptpInByCallId(struct libalias *la, struct in_addr dst_addr, struct in_addr alias_addr, @@ -1658,7 +1623,6 @@ FindPptpInByCallId(struct libalias *la, struct in_addr dst_addr, return (lnk); } - struct alias_link * FindPptpInByPeerCallId(struct libalias *la, struct in_addr dst_addr, struct in_addr alias_addr, @@ -1671,11 +1635,9 @@ FindPptpInByPeerCallId(struct libalias *la, struct in_addr dst_addr, 0 /* any */ , alias_call_id, LINK_PPTP, 0); - return (lnk); } - struct alias_link * FindRtspOut(struct libalias *la, struct in_addr src_addr, struct in_addr dst_addr, @@ -1712,7 +1674,6 @@ FindRtspOut(struct libalias *la, struct in_addr src_addr, return (lnk); } - struct in_addr FindOriginalAddress(struct libalias *la, struct in_addr alias_addr) { @@ -1745,7 +1706,6 @@ FindOriginalAddress(struct libalias *la, struct in_addr alias_addr) } } - struct in_addr FindAliasAddress(struct libalias *la, struct in_addr original_addr) { @@ -1766,7 +1726,6 @@ FindAliasAddress(struct libalias *la, struct in_addr original_addr) } } - /* External routines for getting or changing link data (external to alias_db.c, but internal to alias*.c) @@ -1781,35 +1740,30 @@ FindAliasAddress(struct libalias *la, struct in_addr original_addr) SetDestCallId() */ - void SetFragmentAddr(struct alias_link *lnk, struct in_addr src_addr) { lnk->data.frag_addr = src_addr; } - void GetFragmentAddr(struct alias_link *lnk, struct in_addr *src_addr) { *src_addr = lnk->data.frag_addr; } - void SetFragmentPtr(struct alias_link *lnk, void *fptr) { lnk->data.frag_ptr = fptr; } - void GetFragmentPtr(struct alias_link *lnk, void **fptr) { *fptr = lnk->data.frag_ptr; } - void SetStateIn(struct alias_link *lnk, int state) { @@ -1835,7 +1789,6 @@ SetStateIn(struct alias_link *lnk, int state) lnk->data.tcp->state.in = state; } - void SetStateOut(struct alias_link *lnk, int state) { @@ -1861,7 +1814,6 @@ SetStateOut(struct alias_link *lnk, int state) lnk->data.tcp->state.out = state; } - int GetStateIn(struct alias_link *lnk) { @@ -1869,7 +1821,6 @@ GetStateIn(struct alias_link *lnk) return (lnk->data.tcp->state.in); } - int GetStateOut(struct alias_link *lnk) { @@ -1877,7 +1828,6 @@ GetStateOut(struct alias_link *lnk) return (lnk->data.tcp->state.out); } - struct in_addr GetOriginalAddress(struct alias_link *lnk) { @@ -1887,14 +1837,12 @@ GetOriginalAddress(struct alias_link *lnk) return (lnk->src_addr); } - struct in_addr GetDestAddress(struct alias_link *lnk) { return (lnk->dst_addr); } - struct in_addr GetAliasAddress(struct alias_link *lnk) { @@ -1904,16 +1852,14 @@ GetAliasAddress(struct alias_link *lnk) return (lnk->alias_addr); } - struct in_addr GetDefaultAliasAddress(struct libalias *la) { - + LIBALIAS_LOCK_ASSERT(la); return (la->aliasAddress); } - void SetDefaultAliasAddress(struct libalias *la, struct in_addr alias_addr) { @@ -1922,14 +1868,12 @@ SetDefaultAliasAddress(struct libalias *la, struct in_addr alias_addr) la->aliasAddress = alias_addr; } - u_short GetOriginalPort(struct alias_link *lnk) { return (lnk->src_port); } - u_short GetAliasPort(struct alias_link *lnk) { @@ -1952,35 +1896,30 @@ SetAckModified(struct alias_link *lnk) lnk->data.tcp->state.ack_modified = 1; } - struct in_addr GetProxyAddress(struct alias_link *lnk) { return (lnk->proxy_addr); } - void SetProxyAddress(struct alias_link *lnk, struct in_addr addr) { lnk->proxy_addr = addr; } - u_short GetProxyPort(struct alias_link *lnk) { return (lnk->proxy_port); } - void SetProxyPort(struct alias_link *lnk, u_short port) { lnk->proxy_port = port; } - int GetAckModified(struct alias_link *lnk) { @@ -2129,7 +2068,7 @@ SetExpire(struct alias_link *lnk, int expire) void ClearCheckNewLink(struct libalias *la) { - + LIBALIAS_LOCK_ASSERT(la); la->newDefaultLink = 0; } @@ -2160,7 +2099,6 @@ SetDestCallId(struct alias_link *lnk, u_int16_t cid) la->deleteAllLinks = 0; } - /* Miscellaneous Functions HouseKeeping() @@ -2417,7 +2355,6 @@ LibAliasRedirectAddr(struct libalias *la, struct in_addr src_addr, return (lnk); } - /* Mark the aliasing link dynamic */ int LibAliasRedirectDynamic(struct libalias *la, struct alias_link *lnk) @@ -2437,7 +2374,6 @@ LibAliasRedirectDynamic(struct libalias *la, struct alias_link *lnk) return (res); } - void LibAliasRedirectDelete(struct libalias *la, struct alias_link *lnk) { @@ -2451,7 +2387,6 @@ LibAliasRedirectDelete(struct libalias *la, struct alias_link *lnk) LIBALIAS_UNLOCK(la); } - void LibAliasSetAddress(struct libalias *la, struct in_addr addr) { @@ -2465,7 +2400,6 @@ LibAliasSetAddress(struct libalias *la, struct in_addr addr) LIBALIAS_UNLOCK(la); } - void LibAliasSetAliasPortRange(struct libalias *la, u_short port_low, u_short port_high) @@ -2640,7 +2574,6 @@ getout: return (res); } - int LibAliasCheckNewLink(struct libalias *la) { @@ -2652,7 +2585,6 @@ LibAliasCheckNewLink(struct libalias *la) return (res); } - #ifndef NO_FW_PUNCH /***************** @@ -2738,7 +2670,6 @@ fill_rule(void *buf, int bufsize, int rulenum, static void ClearAllFWHoles(struct libalias *la); - #define fw_setfield(la, field, num) \ do { \ (field)[(num) - la->fireWallBaseNum] = 1; \ diff --git a/sys/netinet/libalias/alias_dummy.c b/sys/netinet/libalias/alias_dummy.c index 084436cc4ea1..375dbc9f5b4c 100644 --- a/sys/netinet/libalias/alias_dummy.c +++ b/sys/netinet/libalias/alias_dummy.c @@ -90,7 +90,7 @@ fingerprint(struct libalias *la, struct alias_data *ah) static int protohandler(struct libalias *la, struct ip *pip, struct alias_data *ah) { - + AliasHandleDummy(la, pip, ah); return (0); } @@ -152,4 +152,3 @@ AliasHandleDummy(struct libalias *la, struct ip *ip, struct alias_data *ah) { ; /* Dummy. */ } - diff --git a/sys/netinet/libalias/alias_ftp.c b/sys/netinet/libalias/alias_ftp.c index f8e0a703345d..e74093f6e5dd 100644 --- a/sys/netinet/libalias/alias_ftp.c +++ b/sys/netinet/libalias/alias_ftp.c @@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$"); changes of sequence and acknowledgment numbers, since the client machine is totally unaware of the modification to the TCP stream. - References: RFC 959, RFC 2428. Initial version: August, 1996 (cjm) @@ -140,7 +139,6 @@ protohandler_out(struct libalias *la, struct ip *pip, struct alias_data *ah) return (0); } - static int protohandler_in(struct libalias *la, struct ip *pip, struct alias_data *ah) { diff --git a/sys/netinet/libalias/alias_irc.c b/sys/netinet/libalias/alias_irc.c index d44aaf16fc7b..ed8e9a95926d 100644 --- a/sys/netinet/libalias/alias_irc.c +++ b/sys/netinet/libalias/alias_irc.c @@ -349,7 +349,6 @@ lCTCP_START: struct alias_link *dcc_lnk; struct in_addr destaddr; - true_port = htons(org_port); true_addr.s_addr = htonl(org_addr); destaddr.s_addr = 0; diff --git a/sys/netinet/libalias/alias_local.h b/sys/netinet/libalias/alias_local.h index d6fe21869f1e..ba128638c1fe 100644 --- a/sys/netinet/libalias/alias_local.h +++ b/sys/netinet/libalias/alias_local.h @@ -127,7 +127,7 @@ struct libalias { int deleteAllLinks; /* If equal to zero, DeleteLink() */ /* will not remove permanent links */ - + /* log descriptor */ #ifdef _KERNEL char *logDesc; @@ -176,10 +176,10 @@ struct libalias { #ifdef _KERNEL /* timing queue for keeping track of association timeouts */ struct sctp_nat_timer sctpNatTimer; - + /* size of hash table used in this instance */ u_int sctpNatTableSize; - + /* * local look up table sorted by l_vtag/l_port */ @@ -188,7 +188,7 @@ struct libalias { * global look up table sorted by g_vtag/g_port */ LIST_HEAD(sctpNatTableG, sctp_nat_assoc) *sctpTableGlobal; - + /* * avoid races in libalias: every public function has to use it. */ @@ -236,7 +236,6 @@ struct libalias { } \ } while (0) - /* Prototypes */ /* diff --git a/sys/netinet/libalias/alias_nbt.c b/sys/netinet/libalias/alias_nbt.c index 5a747f0507d3..e29dc4789248 100644 --- a/sys/netinet/libalias/alias_nbt.c +++ b/sys/netinet/libalias/alias_nbt.c @@ -94,7 +94,7 @@ fingerprint1(struct libalias *la, struct alias_data *ah) static int protohandler1(struct libalias *la, struct ip *pip, struct alias_data *ah) { - + return (AliasHandleUdpNbt(la, pip, ah->lnk, ah->aaddr, *ah->aport)); } @@ -114,7 +114,7 @@ fingerprint2(struct libalias *la, struct alias_data *ah) static int protohandler2in(struct libalias *la, struct ip *pip, struct alias_data *ah) { - + AliasHandleUdpNbtNS(la, pip, ah->lnk, ah->aaddr, ah->aport, ah->oaddr, ah->dport); return (0); @@ -123,7 +123,7 @@ protohandler2in(struct libalias *la, struct ip *pip, struct alias_data *ah) static int protohandler2out(struct libalias *la, struct ip *pip, struct alias_data *ah) { - + return (AliasHandleUdpNbtNS(la, pip, ah->lnk, &pip->ip_src, ah->sport, ah->aaddr, ah->aport)); } @@ -227,7 +227,6 @@ typedef struct { #define ACT_ERR 0x6 #define CFT_ERR 0x7 - #ifdef LIBALIAS_DEBUG static void PrintRcode(u_char rcode) @@ -248,13 +247,11 @@ PrintRcode(u_char rcode) printf("\nName in conflict error.\n"); default: printf("\n?%c?=%0x\n", '?', rcode); - } } #endif - /* Handling Name field */ static u_char * AliasHandleName(u_char * p, char *pmax) diff --git a/sys/netinet/libalias/alias_pptp.c b/sys/netinet/libalias/alias_pptp.c index 897eb74900aa..b28462ce5f75 100644 --- a/sys/netinet/libalias/alias_pptp.c +++ b/sys/netinet/libalias/alias_pptp.c @@ -100,7 +100,7 @@ fingerprintgre(struct libalias *la, struct alias_data *ah) static int protohandlerin(struct libalias *la, struct ip *pip, struct alias_data *ah) { - + AliasHandlePptpIn(la, pip, ah->lnk); return (0); } @@ -108,7 +108,7 @@ protohandlerin(struct libalias *la, struct ip *pip, struct alias_data *ah) static int protohandlerout(struct libalias *la, struct ip *pip, struct alias_data *ah) { - + AliasHandlePptpOut(la, pip, ah->lnk); return (0); } @@ -295,7 +295,6 @@ typedef struct pptpCallIds *PptpCallId; static PptpCallId AliasVerifyPptp(struct ip *, u_int16_t *); - static void AliasHandlePptpOut(struct libalias *la, struct ip *pip, /* IP packet to examine/patch */ diff --git a/sys/netinet/libalias/alias_proxy.c b/sys/netinet/libalias/alias_proxy.c index ef2c8ee3e0ac..79d9db82914c 100644 --- a/sys/netinet/libalias/alias_proxy.c +++ b/sys/netinet/libalias/alias_proxy.c @@ -50,11 +50,9 @@ __FBSDID("$FreeBSD$"); Rules are stored in a linear linked list, so lookup efficiency won't be too good for large lists. - Initial development: April, 1998 (cjm) */ - /* System includes */ #ifdef _KERNEL #include <sys/param.h> @@ -113,14 +111,10 @@ struct proxy_entry { struct proxy_entry *last; }; - - /* File scope variables */ - - /* Local (static) functions: IpMask() -- Utility function for creating IP @@ -452,7 +446,6 @@ ProxyEncodeIpHeader(struct ip *pip, #endif } - /* Functions by other packet alias source files ProxyCheck() -- Checks whether an outgoing packet should @@ -520,7 +513,6 @@ ProxyModify(struct libalias *la, struct alias_link *lnk, } } - /* Public API functions */ diff --git a/sys/netinet/libalias/alias_sctp.c b/sys/netinet/libalias/alias_sctp.c index dd9b97b57475..103932480f67 100644 --- a/sys/netinet/libalias/alias_sctp.c +++ b/sys/netinet/libalias/alias_sctp.c @@ -149,7 +149,6 @@ static void sctp_RmTimeOut(struct libalias *la, struct sctp_nat_assoc *assoc); static void sctp_ResetTimeOut(struct libalias *la, struct sctp_nat_assoc *assoc, int newexp); void sctp_CheckTimers(struct libalias *la); - /* Logging Functions */ static void logsctperror(char* errormsg, uint32_t vtag, int error, int direction); static void logsctpparse(int direction, struct sctp_nat_msg *sm); @@ -242,7 +241,6 @@ static MALLOC_DEFINE(M_SCTPNAT, "sctpnat", "sctp nat dbs"); #define SN_SCTP_ASCONF 0x0100 /**< a packet containing an ASCONF chunk */ #define SN_SCTP_ASCONFACK 0x0200 /**< a packet containing an ASCONF-ACK chunk */ #define SN_SCTP_OTHER 0xFFFF /**< a packet containing a chunk that is not of interest */ - /** @} * @defgroup state_machine SCTP NAT State Machine * @@ -254,7 +252,6 @@ static MALLOC_DEFINE(M_SCTPNAT, "sctpnat", "sctp nat dbs"); #define SN_UP 0x0100 /**< Association in UP state */ #define SN_CL 0x1000 /**< Closing state */ #define SN_RM 0x2000 /**< Removing state */ - /** @} * @defgroup Logging Logging Functionality * @@ -269,7 +266,6 @@ static MALLOC_DEFINE(M_SCTPNAT, "sctpnat", "sctp nat dbs"); #define SN_LOG_DEBUG_MAX 5 #define SN_LOG(level, action) if (sysctl_log_level >= level) { action; } /**< Perform log action ONLY if the current log level meets the specified log level */ - /** @} * @defgroup Hash Hash Table Macros and Functions * @@ -291,7 +287,6 @@ static MALLOC_DEFINE(M_SCTPNAT, "sctpnat", "sctp nat dbs"); #define SN_ADD_CLASH 1 /**< Clash when trying to add the assoc. info to the table */ #define SN_TABLE_HASH(vtag, port, size) (((u_int) vtag + (u_int) port) % (u_int) size) /**< Calculate the hash table lookup position */ - /** @} * @defgroup Timer Timer Queue Macros and Functions *** 205 LINES SKIPPED ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105301926.14UJQUah021297>