diff options
Diffstat (limited to 'freebsd/sys/netinet/libalias/alias_db.c')
| -rw-r--r-- | freebsd/sys/netinet/libalias/alias_db.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/freebsd/sys/netinet/libalias/alias_db.c b/freebsd/sys/netinet/libalias/alias_db.c index 7385027c..28be85da 100644 --- a/freebsd/sys/netinet/libalias/alias_db.c +++ b/freebsd/sys/netinet/libalias/alias_db.c @@ -2171,7 +2171,6 @@ HouseKeeping(struct libalias *la) int i, n; #ifndef _KERNEL struct timeval tv; - struct timezone tz; #endif LIBALIAS_LOCK_ASSERT(la); @@ -2183,7 +2182,7 @@ HouseKeeping(struct libalias *la) #ifdef _KERNEL la->timeStamp = time_uptime; #else - gettimeofday(&tv, &tz); + gettimeofday(&tv, NULL); la->timeStamp = tv.tv_sec; #endif @@ -2478,7 +2477,6 @@ LibAliasInit(struct libalias *la) int i; #ifndef _KERNEL struct timeval tv; - struct timezone tz; #endif if (la == NULL) { @@ -2505,7 +2503,7 @@ LibAliasInit(struct libalias *la) la->timeStamp = time_uptime; la->lastCleanupTime = time_uptime; #else - gettimeofday(&tv, &tz); + gettimeofday(&tv, NULL); la->timeStamp = tv.tv_sec; la->lastCleanupTime = tv.tv_sec; #endif @@ -2737,7 +2735,6 @@ static void InitPunchFW(struct libalias *la) { - LIBALIAS_LOCK_ASSERT(la); la->fireWallField = malloc(la->fireWallNumNums); if (la->fireWallField) { memset(la->fireWallField, 0, la->fireWallNumNums); @@ -2753,7 +2750,6 @@ static void UninitPunchFW(struct libalias *la) { - LIBALIAS_LOCK_ASSERT(la); ClearAllFWHoles(la); if (la->fireWallFD >= 0) close(la->fireWallFD); @@ -2773,7 +2769,6 @@ PunchFWHole(struct alias_link *lnk) struct ip_fw rule; /* On-the-fly built rule */ int fwhole; /* Where to punch hole */ - LIBALIAS_LOCK_ASSERT(la); la = lnk->la; /* Don't do anything unless we are asked to */ @@ -2847,7 +2842,6 @@ ClearFWHole(struct alias_link *lnk) { struct libalias *la; - LIBALIAS_LOCK_ASSERT(la); la = lnk->la; if (lnk->link_type == LINK_TCP) { int fwhole = lnk->data.tcp->fwhole; /* Where is the firewall @@ -2872,7 +2866,6 @@ ClearAllFWHoles(struct libalias *la) struct ip_fw rule; /* On-the-fly built rule */ int i; - LIBALIAS_LOCK_ASSERT(la); if (la->fireWallFD < 0) return; @@ -2886,7 +2879,7 @@ ClearAllFWHoles(struct libalias *la) memset(la->fireWallField, 0, la->fireWallNumNums); } -#endif +#endif /* !NO_FW_PUNCH */ void LibAliasSetFWBase(struct libalias *la, unsigned int base, unsigned int num) |