Fix outgoing ICMP on global instance.

This commit is contained in:
Poul-Henning Kamp 2004-08-14 14:21:09 +00:00
parent 1f9bb6cd25
commit e7581f0fc2
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=133719
2 changed files with 10 additions and 10 deletions

View File

@ -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);
}

View File

@ -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);
}