118c118
< $FreeBSD: head/sys/netinet/libalias/alias_db.c 67316 2000-10-19 10:44:44Z ru $
---
> $FreeBSD: head/sys/netinet/libalias/alias_db.c 67966 2000-10-30 12:39:41Z ru $
161d160
< #define PPTP_EXPIRE_TIME 60
425c424,425
< n += alias_port;
---
> if (link_type != LINK_PPTP)
> n += alias_port;
439,440c439,442
< n += src_port;
< n += dst_port;
---
> if (link_type != LINK_PPTP) {
> n += src_port;
> n += dst_port;
> }
1007c1009
< link->expire_time = PPTP_EXPIRE_TIME;
---
> link->flags |= LINK_PERMANENT; /* no timeout. */
1392c1394,1395
< FindPptpIn(), FindPptpOut()
---
> AddPptp(), FindPptpOutByCallId(), FindPptpInByCallId(),
> FindPptpOutByPeerCallId(), FindPptpInByPeerCallId()
1633,1682d1635
< FindPptpIn(struct in_addr dst_addr,
< struct in_addr alias_addr,
< u_short call_id)
< {
< struct alias_link *link;
<
< link = FindLinkIn(dst_addr, alias_addr,
< NO_DEST_PORT, call_id,
< LINK_PPTP, 1);
<
< if (link == NULL && !(packetAliasMode & PKT_ALIAS_DENY_INCOMING))
< {
< struct in_addr target_addr;
<
< target_addr = FindOriginalAddress(alias_addr);
< link = AddLink(target_addr, dst_addr, alias_addr,
< call_id, NO_DEST_PORT, call_id,
< LINK_PPTP);
< }
<
< return(link);
< }
<
<
< struct alias_link *
< FindPptpOut(struct in_addr src_addr,
< struct in_addr dst_addr,
< u_short call_id)
< {
< struct alias_link *link;
<
< link = FindLinkOut(src_addr, dst_addr,
< call_id, NO_DEST_PORT,
< LINK_PPTP, 1);
<
< if (link == NULL)
< {
< struct in_addr alias_addr;
<
< alias_addr = FindAliasAddress(src_addr);
< link = AddLink(src_addr, dst_addr, alias_addr,
< call_id, NO_DEST_PORT, GET_ALIAS_PORT,
< LINK_PPTP);
< }
<
< return(link);
< }
<
<
< struct alias_link *
1742a1696,1702
> struct alias_link *
> AddPptp(struct in_addr src_addr,
> struct in_addr dst_addr,
> struct in_addr alias_addr,
> u_int16_t src_call_id)
> {
> struct alias_link *link;
1743a1704,1787
> link = AddLink(src_addr, dst_addr, alias_addr,
> src_call_id, 0, GET_ALIAS_PORT,
> LINK_PPTP);
>
> return (link);
> }
>
>
> struct alias_link *
> FindPptpOutByCallId(struct in_addr src_addr,
> struct in_addr dst_addr,
> u_int16_t src_call_id)
> {
> u_int i;
> struct alias_link *link;
>
> i = StartPointOut(src_addr, dst_addr, 0, 0, LINK_PPTP);
> LIST_FOREACH(link, &linkTableOut[i], list_out)
> if (link->link_type == LINK_PPTP &&
> link->src_addr.s_addr == src_addr.s_addr &&
> link->dst_addr.s_addr == dst_addr.s_addr &&
> link->src_port == src_call_id)
> break;
>
> return (link);
> }
>
>
> struct alias_link *
> FindPptpOutByPeerCallId(struct in_addr src_addr,
> struct in_addr dst_addr,
> u_int16_t dst_call_id)
> {
> u_int i;
> struct alias_link *link;
>
> i = StartPointOut(src_addr, dst_addr, 0, 0, LINK_PPTP);
> LIST_FOREACH(link, &linkTableOut[i], list_out)
> if (link->link_type == LINK_PPTP &&
> link->src_addr.s_addr == src_addr.s_addr &&
> link->dst_addr.s_addr == dst_addr.s_addr &&
> link->dst_port == dst_call_id)
> break;
>
> return (link);
> }
>
>
> struct alias_link *
> FindPptpInByCallId(struct in_addr dst_addr,
> struct in_addr alias_addr,
> u_int16_t dst_call_id)
> {
> u_int i;
> struct alias_link *link;
>
> i = StartPointIn(alias_addr, 0, LINK_PPTP);
> LIST_FOREACH(link, &linkTableIn[i], list_in)
> if (link->link_type == LINK_PPTP &&
> link->dst_addr.s_addr == dst_addr.s_addr &&
> link->alias_addr.s_addr == alias_addr.s_addr &&
> link->dst_port == dst_call_id)
> break;
>
> return (link);
> }
>
>
> struct alias_link *
> FindPptpInByPeerCallId(struct in_addr dst_addr,
> struct in_addr alias_addr,
> u_int16_t alias_call_id)
> {
> struct alias_link *link;
>
> link = FindLinkIn(dst_addr, alias_addr,
> 0/* any */, alias_call_id,
> LINK_PPTP, 0);
>
>
> return (link);
> }
>
>
1847a1892
> SetDestCallId()
2229a2275,2277
> void
> SetDestCallId(struct alias_link *link, u_int16_t cid)
> {
2230a2279,2285
> deleteAllLinks = 1;
> link = ReLink(link, link->src_addr, link->dst_addr, link->alias_addr,
> link->src_port, cid, link->alias_port, link->link_type);
> deleteAllLinks = 0;
> }
>
>