From e7581f0fc2b97703022b42069967a8cfca46e8a2 Mon Sep 17 00:00:00 2001 From: Poul-Henning Kamp Date: Sat, 14 Aug 2004 14:21:09 +0000 Subject: [PATCH] Fix outgoing ICMP on global instance. --- lib/libalias/alias.c | 10 +++++----- sys/netinet/libalias/alias.c | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/libalias/alias.c b/lib/libalias/alias.c index a2c29118caf2..3f52e57d6b2d 100644 --- a/lib/libalias/alias.c +++ b/lib/libalias/alias.c @@ -259,7 +259,7 @@ static int IcmpAliasIn1(struct libalias *, struct ip *); static int IcmpAliasIn2(struct libalias *, struct ip *); static int IcmpAliasIn(struct libalias *, struct ip *); -static int IcmpAliasOut1(struct libalias *, struct ip *); +static int IcmpAliasOut1(struct libalias *, struct ip *, int create); static int IcmpAliasOut2(struct libalias *, struct ip *); static int IcmpAliasOut(struct libalias *, struct ip *, int create); @@ -452,7 +452,7 @@ IcmpAliasIn(struct libalias *la, struct ip *pip) static int -IcmpAliasOut1(struct libalias *la, struct ip *pip) +IcmpAliasOut1(struct libalias *la, struct ip *pip, int create) { /* Alias outgoing echo and timestamp requests. @@ -464,7 +464,7 @@ IcmpAliasOut1(struct libalias *la, struct ip *pip) ic = (struct icmp *)ip_next(pip); /* Save overwritten data for when echo packet returns */ - lnk = FindIcmpOut(la, pip->ip_src, pip->ip_dst, ic->icmp_id, 1); + lnk = FindIcmpOut(la, pip->ip_src, pip->ip_dst, ic->icmp_id, create); if (lnk != NULL) { u_short alias_id; int accumulate; @@ -614,7 +614,7 @@ IcmpAliasOut(struct libalias *la, struct ip *pip, int create) case ICMP_ECHO: case ICMP_TSTAMP: if (ic->icmp_code == 0) { - iresult = IcmpAliasOut1(la, pip); + iresult = IcmpAliasOut1(la, pip, create); } break; case ICMP_UNREACH: @@ -625,7 +625,7 @@ IcmpAliasOut(struct libalias *la, struct ip *pip, int create) break; case ICMP_ECHOREPLY: case ICMP_TSTAMPREPLY: - iresult = IcmpAliasOut1(la, pip); + iresult = IcmpAliasOut1(la, pip, create); } return (iresult); } diff --git a/sys/netinet/libalias/alias.c b/sys/netinet/libalias/alias.c index a2c29118caf2..3f52e57d6b2d 100644 --- a/sys/netinet/libalias/alias.c +++ b/sys/netinet/libalias/alias.c @@ -259,7 +259,7 @@ static int IcmpAliasIn1(struct libalias *, struct ip *); static int IcmpAliasIn2(struct libalias *, struct ip *); static int IcmpAliasIn(struct libalias *, struct ip *); -static int IcmpAliasOut1(struct libalias *, struct ip *); +static int IcmpAliasOut1(struct libalias *, struct ip *, int create); static int IcmpAliasOut2(struct libalias *, struct ip *); static int IcmpAliasOut(struct libalias *, struct ip *, int create); @@ -452,7 +452,7 @@ IcmpAliasIn(struct libalias *la, struct ip *pip) static int -IcmpAliasOut1(struct libalias *la, struct ip *pip) +IcmpAliasOut1(struct libalias *la, struct ip *pip, int create) { /* Alias outgoing echo and timestamp requests. @@ -464,7 +464,7 @@ IcmpAliasOut1(struct libalias *la, struct ip *pip) ic = (struct icmp *)ip_next(pip); /* Save overwritten data for when echo packet returns */ - lnk = FindIcmpOut(la, pip->ip_src, pip->ip_dst, ic->icmp_id, 1); + lnk = FindIcmpOut(la, pip->ip_src, pip->ip_dst, ic->icmp_id, create); if (lnk != NULL) { u_short alias_id; int accumulate; @@ -614,7 +614,7 @@ IcmpAliasOut(struct libalias *la, struct ip *pip, int create) case ICMP_ECHO: case ICMP_TSTAMP: if (ic->icmp_code == 0) { - iresult = IcmpAliasOut1(la, pip); + iresult = IcmpAliasOut1(la, pip, create); } break; case ICMP_UNREACH: @@ -625,7 +625,7 @@ IcmpAliasOut(struct libalias *la, struct ip *pip, int create) break; case ICMP_ECHOREPLY: case ICMP_TSTAMPREPLY: - iresult = IcmpAliasOut1(la, pip); + iresult = IcmpAliasOut1(la, pip, create); } return (iresult); }