5c5
< * $Id: alias_cmd.c,v 1.28 1999/07/24 02:53:39 brian Exp $
---
> * $Id: alias_cmd.c,v 1.29 1999/07/28 19:39:00 brian Exp $
73c73
< alias_RedirectPort(struct cmdargs const *arg)
---
> nat_RedirectPort(struct cmdargs const *arg)
75c75
< if (!arg->bundle->AliasEnabled) {
---
> if (!arg->bundle->NatEnabled) {
104c104
< prompt_Printf(arg->prompt, "alias port: error reading localaddr:port\n");
---
> prompt_Printf(arg->prompt, "nat port: error reading localaddr:port\n");
111c111
< prompt_Printf(arg->prompt, "alias port: error reading alias port\n");
---
> prompt_Printf(arg->prompt, "nat port: error reading alias port\n");
120c120
< prompt_Printf(arg->prompt, "alias port: error reading "
---
> prompt_Printf(arg->prompt, "nat port: error reading "
134c134
< prompt_Printf(arg->prompt, "alias port: local & alias port ranges "
---
> prompt_Printf(arg->prompt, "nat port: local & alias port ranges "
140c140
< prompt_Printf(arg->prompt, "alias port: local & remote port ranges "
---
> prompt_Printf(arg->prompt, "nat port: local & remote port ranges "
152c152
< prompt_Printf(arg->prompt, "alias port: %d: error %d\n", laliasport,
---
> prompt_Printf(arg->prompt, "nat port: %d: error %d\n", laliasport,
170c170
< alias_RedirectAddr(struct cmdargs const *arg)
---
> nat_RedirectAddr(struct cmdargs const *arg)
172,173c172,173
< if (!arg->bundle->AliasEnabled) {
< prompt_Printf(arg->prompt, "alias not enabled\n");
---
> if (!arg->bundle->NatEnabled) {
> prompt_Printf(arg->prompt, "nat not enabled\n");
188c188
< prompt_Printf(arg->prompt, "Usage: alias %s %s\n", arg->cmd->name,
---
> prompt_Printf(arg->prompt, "Usage: nat %s %s\n", arg->cmd->name,
196c196
< prompt_Printf(arg->prompt, "Usage: alias %s %s\n", arg->cmd->name,
---
> prompt_Printf(arg->prompt, "Usage: nat %s %s\n", arg->cmd->name,
292c292
< alias_ProxyRule(struct cmdargs const *arg)
---
> nat_ProxyRule(struct cmdargs const *arg)
315c315
< alias_Pptp(struct cmdargs const *arg)
---
> nat_Pptp(struct cmdargs const *arg)
339c339
< alias_PadMbuf(struct mbuf *bp, int type)
---
> nat_PadMbuf(struct mbuf *bp, int type)
355c355
< alias_LayerPush(struct bundle *bundle, struct link *l, struct mbuf *bp,
---
> nat_LayerPush(struct bundle *bundle, struct link *l, struct mbuf *bp,
358c358
< if (!bundle->AliasEnabled || *proto != PROTO_IP)
---
> if (!bundle->NatEnabled || *proto != PROTO_IP)
361,362c361,362
< log_Printf(LogDEBUG, "alias_LayerPush: PROTO_IP -> PROTO_IP\n");
< bp = mbuf_Contiguous(alias_PadMbuf(bp, MB_ALIASOUT));
---
> log_Printf(LogDEBUG, "nat_LayerPush: PROTO_IP -> PROTO_IP\n");
> bp = mbuf_Contiguous(nat_PadMbuf(bp, MB_NATOUT));
370c370
< alias_LayerPull(struct bundle *bundle, struct link *l, struct mbuf *bp,
---
> nat_LayerPull(struct bundle *bundle, struct link *l, struct mbuf *bp,
378c378
< if (!bundle->AliasEnabled || *proto != PROTO_IP)
---
> if (!bundle->NatEnabled || *proto != PROTO_IP)
381,382c381,382
< log_Printf(LogDEBUG, "alias_LayerPull: PROTO_IP -> PROTO_IP\n");
< bp = mbuf_Contiguous(alias_PadMbuf(bp, MB_ALIASIN));
---
> log_Printf(LogDEBUG, "nat_LayerPull: PROTO_IP -> PROTO_IP\n");
> bp = mbuf_Contiguous(nat_PadMbuf(bp, MB_NATIN));
394c394
< log_Printf(LogWARN, "alias_LayerPull: Problem with IP header length\n");
---
> log_Printf(LogWARN, "nat_LayerPull: Problem with IP header length\n");
416c416
< *last = mbuf_Alloc(len, MB_ALIASIN);
---
> *last = mbuf_Alloc(len, MB_NATIN);
432,433c432,433
< struct layer aliaslayer =
< { LAYER_ALIAS, "alias", alias_LayerPush, alias_LayerPull };
---
> struct layer natlayer =
> { LAYER_NAT, "nat", nat_LayerPush, nat_LayerPull };