Page MenuHomeFreeBSD
Files F102691338

D27883.diff
No OneTemporary
Actions

D27883.diff
View Options

diff --git a/sys/netinet/libalias/alias.c b/sys/netinet/libalias/alias.c
--- a/sys/netinet/libalias/alias.c
+++ b/sys/netinet/libalias/alias.c
@@ -435,7 +435,8 @@
IcmpAliasIn(struct libalias *la, struct ip *pip)
{
struct icmp *ic;
- int dlen, iresult;
+ int iresult;
+ size_t dlen;
LIBALIAS_LOCK_ASSERT(la);
@@ -462,7 +463,7 @@
case ICMP_TIMXCEED:
case ICMP_PARAMPROB:
if (dlen < ICMP_ADVLENMIN ||
- dlen < ICMP_ADVLEN(ic))
+ dlen < (size_t)ICMP_ADVLEN(ic))
return (PKT_ALIAS_IGNORED);
iresult = IcmpAliasIn2(la, pip);
break;
@@ -728,7 +729,7 @@
{
struct udphdr *ud;
struct alias_link *lnk;
- int dlen;
+ size_t dlen;
LIBALIAS_LOCK_ASSERT(la);
@@ -827,7 +828,8 @@
u_short dest_port;
u_short proxy_server_port;
int proxy_type;
- int dlen, error;
+ int error;
+ size_t dlen;
LIBALIAS_LOCK_ASSERT(la);
@@ -930,7 +932,7 @@
{
struct tcphdr *tc;
struct alias_link *lnk;
- int dlen;
+ size_t dlen;
LIBALIAS_LOCK_ASSERT(la);
@@ -1055,9 +1057,10 @@
static int
TcpAliasOut(struct libalias *la, struct ip *pip, int maxpacketsize, int create)
{
- int dlen, proxy_type, error;
+ int proxy_type, error;
u_short dest_port;
u_short proxy_server_port;
+ size_t dlen;
struct in_addr dest_address;
struct in_addr proxy_server_address;
struct tcphdr *tc;
diff --git a/sys/netinet/libalias/alias_mod.c b/sys/netinet/libalias/alias_mod.c
--- a/sys/netinet/libalias/alias_mod.c
+++ b/sys/netinet/libalias/alias_mod.c
@@ -129,7 +129,7 @@
#ifndef _KERNEL
/* Dll manipulation code - this code is not thread safe... */
-SLIST_HEAD(dll_chain, dll) dll_chain = SLIST_HEAD_INITIALIZER(dll_chain);
+static SLIST_HEAD(dll_chain, dll) dll_chain = SLIST_HEAD_INITIALIZER(dll_chain);
int
attach_dll(struct dll *p)
{

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 16, 10:21 PM (21 h, 51 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14665922
Default Alt Text
D27883.diff (1 KB)

Event Timeline