Page MenuHomeFreeBSD
Differential D35552

vt: Fix contents of paste buffer for newcons.
ClosedPublic
Actions

Authored by • hselasky on Jun 22 2022, 4:40 PM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Apr 11, 4:38 PM
Unknown Object (File)
Wed, Mar 26, 8:01 PM
Unknown Object (File)
Mar 15 2025, 9:26 PM
Unknown Object (File)
Mar 7 2025, 6:52 PM
Unknown Object (File)
Mar 6 2025, 5:02 AM
Unknown Object (File)
Mar 6 2025, 12:04 AM
Unknown Object (File)
Mar 4 2025, 10:19 AM
Unknown Object (File)
Feb 17 2025, 10:21 PM
View All Files
Subscribers
imp
junchoon_dec.sakura.ne.jp
pi
tezeka_hotmail.com

Details

Reviewers
emaste
ed
manu
• hselasky
Commits
rG4437a2e1ddcb: vt: Fix contents of paste buffer for newcons.
rGd4dd3c8f8b5b: vt: Improve multi lingual word separation.
rG9971e6aff1be: vt: Improve multi lingual word separation.
rG5fe0a82501cb: vt: Fix contents of paste buffer for newcons.
Summary

Trim all whitespace from end of line, except for last line and
only use '\r' to terminate the pasted lines as expected by TTY.




Submitted by:   Ivan Quitschal <tezeka@hotmail.com>

MFC after:      1 week

Sponsored by:   NVIDIA Networking
Diff Detail
Repository 
rG FreeBSD src repository 
Lint 
Lint Skipped
 
Unit 
Tests Skipped
 
Event Timeline
• hselasky created this revision.Jun 22 2022, 4:40 PM
Herald added a subscriber: imp.  ·  View Herald TranscriptJun 22 2022, 4:40 PM
• hselasky requested review of this revision.Jun 22 2022, 4:40 PM
junchoon_dec.sakura.ne.jp added a subscriber: junchoon_dec.sakura.ne.jp.Jun 22 2022, 4:54 PM
• hselasky updated this revision to Diff 107257.Jun 22 2022, 4:55 PM
Make sure to zero-fill the remainder of the paste buffer, which will be skipped during paste.
• hselasky added a reviewer: manu.Jun 22 2022, 4:55 PM
emaste added a subscriber: tezeka_hotmail.com.Jun 22 2022, 4:57 PM
emaste added a comment.Jun 22 2022, 4:59 PM
PR https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=263084
• hselasky updated this revision to Diff 107258.Jun 22 2022, 5:05 PM
Use TCHAR_CHARACTER() to detect whitespace.



Pointed out by:  Tomoaki AOKI
pi added a subscriber: pi.Jun 22 2022, 5:32 PM
• hselasky updated this revision to Diff 107324.Jun 23 2022, 7:08 PM
Fix some bugs.



    

  1. TTY converts \r to \n and \n to \0 , so only emit \r for newline.
    2. 

  2. Use TCHAR macro when checking for NUL character.
    3. 

• hselasky added a comment.Jun 23 2022, 7:08 PM
Please test! Works fine here.
• hselasky edited the summary of this revision. (Show Details)Jun 23 2022, 7:16 PM
• hselasky updated this revision to Diff 107328.Jun 23 2022, 7:41 PM
Keep trailing space on last line.
• hselasky edited the summary of this revision. (Show Details)Jun 23 2022, 7:45 PM
junchoon_dec.sakura.ne.jp added a comment.Jun 24 2022, 1:46 PM


In D35552#806924, @hselasky wrote:


Keep trailing space on last line.





Worked "almost" as expected.



*No unneeded '\0' pasted.
*Proper newline.
*Pasted wanted last-line trailing space.
*But unfortunately, IDEOGRAPHIC (Full-width) SPACE (E38080,  U+3000) seems to be treated
 as regular character, not as space.



Anyway, thanks in advance!
• hselasky updated this revision to Diff 107371.Jun 25 2022, 9:25 AM
Updated patch with support for more unicode word separators.



Patches will be split before commit.
• hselasky updated this revision to Diff 107372.Jun 25 2022, 9:28 AM
Include all chunks.
• hselasky accepted this revision.Jun 25 2022, 9:30 AM
This revision is now accepted and ready to land.Jun 25 2022, 9:30 AM
junchoon_dec.sakura.ne.jp added a comment.Jun 25 2022, 10:20 PM


In D35552#807231, @hselasky wrote:


Include all chunks.





Thanks!

Tested and worked just as intended.



*Trailing spaces only listed in switch() of tchar_is_word_separator() are deleted on non-last lines.
*Space (tried U+3000 only, though) before U+2007, which is not listed and untouched, on non-last line is sanely kept.



If any others having objection to handled spaces pop in, only the switch() part is needed to be re-considererd.

Right?
Closed by commit rG5fe0a82501cb: vt: Fix contents of paste buffer for newcons. (authored by • hselasky).  ·  Explain WhyJun 27 2022, 8:18 AM
This revision was automatically updated to reflect the committed changes.
• hselasky added a commit: rG5fe0a82501cb: vt: Fix contents of paste buffer for newcons..
• hselasky added a commit: rG9971e6aff1be: vt: Improve multi lingual word separation..
• hselasky added a commit: rG4437a2e1ddcb: vt: Fix contents of paste buffer for newcons..Jul 5 2022, 11:58 AM
• hselasky added a commit: rGd4dd3c8f8b5b: vt: Improve multi lingual word separation..
Revision Contents
Changeset List
PathSize
sys/
dev/
vt/
28 lines
5 lines
Diff 107324
View Options
sys/dev/vt/vt_buf.c
  • This file was added.
#include <atf-c.h>

#include <alias.h>

#include <stdio.h>

#include <stdlib.h>



#include "util.h"



ATF_TC_WITHOUT_HEAD(1_portforward);

ATF_TC_BODY(1_portforward, dummy)

{

        struct libalias *la = LibAliasInit(NULL);

        struct alias_link *pf1, *pf2, *pf3, *pf4;

        struct ip *p;

        struct udphdr *u;



        ATF_REQUIRE(la != NULL);

        LibAliasSetAddress(la, masq);

        LibAliasSetMode(la, PKT_ALIAS_RESET_ON_ADDR_CHANGE, ~0);

        LibAliasSetMode(la, PKT_ALIAS_DENY_INCOMING, PKT_ALIAS_DENY_INCOMING);



        /*

         * Fully specified

         */

        pf1 = LibAliasRedirectPort(la, prv1, ntohs(0x1234), ext, ntohs(0x5678), masq, ntohs(0xabcd), IPPROTO_UDP);

        ATF_REQUIRE(pf1 != NULL);



        p = ip_packet(0, 64);

        UDP_UNNAT_CHECK(p, u, ext, 0x5678, masq, 0xabcd, prv1, 0x1234);



        /* try again */

        UDP_UNNAT_CHECK(p, u, ext, 0x5678, masq, 0xabcd, prv1, 0x1234);



        /* different source */

        UDP_UNNAT_FAIL(p, u, pub, 0x5678, masq, 0xabcd);

        UDP_UNNAT_FAIL(p, u, ext, 0xdead, masq, 0xabcd);



        /* clear table by keeping the address */

        LibAliasSetAddress(la, ext);

        LibAliasSetAddress(la, masq);



        /* delete and try again */

        LibAliasRedirectDelete(la, pf1);

        UDP_UNNAT_FAIL(p, u, ext, 0x5678, masq, 0xabcd);



        /*

         * Any external port

         */

        pf2 = LibAliasRedirectPort(la, prv2, ntohs(0x1234), ext, ntohs(0), masq, ntohs(0xabcd), IPPROTO_UDP);

        ATF_REQUIRE(pf2 != NULL);



        u = set_udp(p, 0x5678, 0xabcd);

        UNNAT_CHECK(p, ext, masq, prv2);

        ATF_CHECK(u->uh_sport == ntohs(0x5678));

        ATF_CHECK(u->uh_dport == ntohs(0x1234));



        /* try again */

        u = set_udp(p, 0x5678, 0xabcd);

        UNNAT_CHECK(p, ext, masq, prv2);

        ATF_CHECK(u->uh_sport == ntohs(0x5678));

        ATF_CHECK(u->uh_dport == ntohs(0x1234));



        /* different source */

        u = set_udp(p, 0x5678, 0xabcd);

        UNNAT_FAIL(p, pub, masq);

        u = set_udp(p, 0xdead, 0xabcd);

        UNNAT_CHECK(p, ext, masq, prv2);

        ATF_CHECK(u->uh_sport == ntohs(0xdead));

        ATF_CHECK(u->uh_dport == ntohs(0x1234));



        /* clear table by keeping the address */

        LibAliasSetAddress(la, ext);

        LibAliasSetAddress(la, masq);



        LibAliasRedirectDelete(la, pf2);

        /* try again, but not the existing flow */

        u = set_udp(p, 0x5678, 0xabcd);

        UNNAT_FAIL(p, ext, masq);



        /*

         * Any external host

         */

        pf3 = LibAliasRedirectPort(la, prv3, ntohs(0x1234), ANY_ADDR, ntohs(0x5678), masq, ntohs(0xabcd), IPPROTO_UDP);

        ATF_REQUIRE(pf3 != NULL);



        u = set_udp(p, 0x5678, 0xabcd);

        UNNAT_CHECK(p, ext, masq, prv3);

        ATF_CHECK(u->uh_sport == ntohs(0x5678));

        ATF_CHECK(u->uh_dport == ntohs(0x1234));



        /* try again */

        u = set_udp(p, 0x5678, 0xabcd);

        UNNAT_CHECK(p, ext, masq, prv3);

        ATF_CHECK(u->uh_sport == ntohs(0x5678));

        ATF_CHECK(u->uh_dport == ntohs(0x1234));



        /* different source */

        u = set_udp(p, 0x5678, 0xabcd);

        UNNAT_CHECK(p, pub, masq, prv3);

        ATF_CHECK(u->uh_sport == ntohs(0x5678));

        ATF_CHECK(u->uh_dport == ntohs(0x1234));

        u = set_udp(p, 0xdead, 0xabcd);

        UNNAT_FAIL(p, ext, masq);



        /* clear table by keeping the address */

        LibAliasSetAddress(la, ext);

        LibAliasSetAddress(la, masq);



        LibAliasRedirectDelete(la, pf3);

        /* try again, but not the existing flow */

        u = set_udp(p, 0x5678, 0xabcd);

        UNNAT_FAIL(p, ext, masq);



        /*

         * Any external host, any port

         */

        pf4 = LibAliasRedirectPort(la, cgn, ntohs(0x1234), ANY_ADDR, ntohs(0), masq, ntohs(0xabcd), IPPROTO_UDP);

        ATF_REQUIRE(pf4 != NULL);



        u = set_udp(p, 0x5678, 0xabcd);

        UNNAT_CHECK(p, ext, masq, cgn);

        ATF_CHECK(u->uh_sport == ntohs(0x5678));

        ATF_CHECK(u->uh_dport == ntohs(0x1234));



        /* try again */

        u = set_udp(p, 0x5678, 0xabcd);

        UNNAT_CHECK(p, ext, masq, cgn);

        ATF_CHECK(u->uh_sport == ntohs(0x5678));

        ATF_CHECK(u->uh_dport == ntohs(0x1234));



        /* different source */

        u = set_udp(p, 0x5678, 0xabcd);

        UNNAT_CHECK(p, pub, masq, cgn);

        ATF_CHECK(u->uh_sport == ntohs(0x5678));

        ATF_CHECK(u->uh_dport == ntohs(0x1234));

        u = set_udp(p, 0xdead, 0xabcd);

        UNNAT_CHECK(p, ext, masq, cgn);

        ATF_CHECK(u->uh_sport == ntohs(0xdead));

        ATF_CHECK(u->uh_dport == ntohs(0x1234));



        /* clear table by keeping the address */

        LibAliasSetAddress(la, ext);

        LibAliasSetAddress(la, masq);



        LibAliasRedirectDelete(la, pf4);

        /* try again, but not the existing flow */

        u = set_udp(p, 0x5678, 0xabcd);

        UNNAT_FAIL(p, ext, masq);



        free(p);

        LibAliasUninit(la);

}



ATF_TC_WITHOUT_HEAD(2_portoverlap);

ATF_TC_BODY(2_portoverlap, dummy)

{

        struct libalias *la = LibAliasInit(NULL);

        struct alias_link *pf1, *pf2, *pf3, *pf4;

        struct ip *p;

        struct udphdr *u;



        ATF_REQUIRE(la != NULL);

        LibAliasSetAddress(la, masq);

        LibAliasSetMode(la, PKT_ALIAS_RESET_ON_ADDR_CHANGE, ~0);

        LibAliasSetMode(la, PKT_ALIAS_DENY_INCOMING, PKT_ALIAS_DENY_INCOMING);



        /*

         * Fully specified

         */

        pf1 = LibAliasRedirectPort(la, prv2, ntohs(0x1234), ext, ntohs(0x5678), masq, ntohs(0xabcd), IPPROTO_UDP);

        ATF_REQUIRE(pf1 != NULL);



        p = ip_packet(0, 64);

        UDP_UNNAT_CHECK(p, u, ext, 0x5678, masq, 0xabcd, prv2, 0x1234);



        /* clear table by keeping the address */

        LibAliasSetAddress(la, ext);

        LibAliasSetAddress(la, masq);



        /*

         * Fully specified (override)

         */

        pf1 = LibAliasRedirectPort(la, prv1, ntohs(0x1234), ext, ntohs(0x5678), masq, ntohs(0xabcd), IPPROTO_UDP);

        ATF_REQUIRE(pf1 != NULL);



        UDP_UNNAT_CHECK(p, u, ext, 0x5678, masq, 0xabcd, prv1, 0x1234);



        /* clear table by keeping the address */

        LibAliasSetAddress(la, ext);

        LibAliasSetAddress(la, masq);



        /*

         * Any external port

         */

        pf2 = LibAliasRedirectPort(la, prv2, ntohs(0x1234), ext, ntohs(0), masq, ntohs(0xabcd), IPPROTO_UDP);

        ATF_REQUIRE(pf2 != NULL);



        UDP_UNNAT_CHECK(p, u, ext, 0x5679, masq, 0xabcd, prv2, 0x1234);

        /* more specific rule wins */

        UDP_UNNAT_CHECK(p, u, ext, 0x5678, masq, 0xabcd, prv1, 0x1234);



        /* clear table by keeping the address */

        LibAliasSetAddress(la, ext);

        LibAliasSetAddress(la, masq);



        /*

         * Any external host

         */

        pf3 = LibAliasRedirectPort(la, prv3, ntohs(0x1234), ANY_ADDR, ntohs(0x5678), masq, ntohs(0xabcd), IPPROTO_UDP);

        ATF_REQUIRE(pf3 != NULL);



        UDP_UNNAT_CHECK(p, u, pub, 0x5678, masq, 0xabcd, prv3, 0x1234);

        /* more specific rule wins */

        UDP_UNNAT_CHECK(p, u, ext, 0x5679, masq, 0xabcd, prv2, 0x1234);

        UDP_UNNAT_CHECK(p, u, ext, 0x5678, masq, 0xabcd, prv1, 0x1234);



        /* clear table by keeping the address */

        LibAliasSetAddress(la, ext);

        LibAliasSetAddress(la, masq);



        /*

         * Any external host, any port

         */

        pf4 = LibAliasRedirectPort(la, cgn, ntohs(0x1234), ANY_ADDR, ntohs(0), masq, ntohs(0xabcd), IPPROTO_UDP);

        ATF_REQUIRE(pf4 != NULL);



        UDP_UNNAT_CHECK(p, u, prv1, 0x5679, masq, 0xabcd, cgn, 0x1234);

        /* more specific rule wins */

        UDP_UNNAT_CHECK(p, u, pub, 0x5678, masq, 0xabcd, prv3, 0x1234);

        UDP_UNNAT_CHECK(p, u, ext, 0x5679, masq, 0xabcd, prv2, 0x1234);

        UDP_UNNAT_CHECK(p, u, ext, 0x5678, masq, 0xabcd, prv1, 0x1234);



        free(p);

        LibAliasUninit(la);

}



ATF_TP_ADD_TCS(natin)

{

        /* Use "dd if=/dev/random bs=2 count=1 | od -x" to reproduce */

        srand(0xe859);



        ATF_TP_ADD_TC(natin, 1_portforward);

        ATF_TP_ADD_TC(natin, 2_portoverlap);



        return atf_no_error();

}

View Options
sys/dev/vt/vt_core.c
  • This file was added.
#include <atf-c.h>

#include <alias.h>

#include <stdio.h>

#include <stdlib.h>



#include "util.h"



ATF_TC_WITHOUT_HEAD(1_portforward);

ATF_TC_BODY(1_portforward, dummy)

{

        struct libalias *la = LibAliasInit(NULL);

        struct alias_link *pf1, *pf2, *pf3, *pf4;

        struct ip *p;

        struct udphdr *u;



        ATF_REQUIRE(la != NULL);

        LibAliasSetAddress(la, masq);

        LibAliasSetMode(la, PKT_ALIAS_RESET_ON_ADDR_CHANGE, ~0);

        LibAliasSetMode(la, PKT_ALIAS_DENY_INCOMING, PKT_ALIAS_DENY_INCOMING);



        /*

         * Fully specified

         */

        pf1 = LibAliasRedirectPort(la, prv1, ntohs(0x1234), ext, ntohs(0x5678), masq, ntohs(0xabcd), IPPROTO_UDP);

        ATF_REQUIRE(pf1 != NULL);



        p = ip_packet(0, 64);

        UDP_UNNAT_CHECK(p, u, ext, 0x5678, masq, 0xabcd, prv1, 0x1234);



        /* try again */

        UDP_UNNAT_CHECK(p, u, ext, 0x5678, masq, 0xabcd, prv1, 0x1234);



        /* different source */

        UDP_UNNAT_FAIL(p, u, pub, 0x5678, masq, 0xabcd);

        UDP_UNNAT_FAIL(p, u, ext, 0xdead, masq, 0xabcd);



        /* clear table by keeping the address */

        LibAliasSetAddress(la, ext);

        LibAliasSetAddress(la, masq);



        /* delete and try again */

        LibAliasRedirectDelete(la, pf1);

        UDP_UNNAT_FAIL(p, u, ext, 0x5678, masq, 0xabcd);



        /*

         * Any external port

         */

        pf2 = LibAliasRedirectPort(la, prv2, ntohs(0x1234), ext, ntohs(0), masq, ntohs(0xabcd), IPPROTO_UDP);

        ATF_REQUIRE(pf2 != NULL);



        u = set_udp(p, 0x5678, 0xabcd);

        UNNAT_CHECK(p, ext, masq, prv2);

        ATF_CHECK(u->uh_sport == ntohs(0x5678));

        ATF_CHECK(u->uh_dport == ntohs(0x1234));



        /* try again */

        u = set_udp(p, 0x5678, 0xabcd);

        UNNAT_CHECK(p, ext, masq, prv2);

        ATF_CHECK(u->uh_sport == ntohs(0x5678));

        ATF_CHECK(u->uh_dport == ntohs(0x1234));



        /* different source */

        u = set_udp(p, 0x5678, 0xabcd);

        UNNAT_FAIL(p, pub, masq);

        u = set_udp(p, 0xdead, 0xabcd);

        UNNAT_CHECK(p, ext, masq, prv2);

        ATF_CHECK(u->uh_sport == ntohs(0xdead));

        ATF_CHECK(u->uh_dport == ntohs(0x1234));



        /* clear table by keeping the address */

        LibAliasSetAddress(la, ext);

        LibAliasSetAddress(la, masq);



        LibAliasRedirectDelete(la, pf2);

        /* try again, but not the existing flow */

        u = set_udp(p, 0x5678, 0xabcd);

        UNNAT_FAIL(p, ext, masq);



        /*

         * Any external host

         */

        pf3 = LibAliasRedirectPort(la, prv3, ntohs(0x1234), ANY_ADDR, ntohs(0x5678), masq, ntohs(0xabcd), IPPROTO_UDP);

        ATF_REQUIRE(pf3 != NULL);



        u = set_udp(p, 0x5678, 0xabcd);

        UNNAT_CHECK(p, ext, masq, prv3);

        ATF_CHECK(u->uh_sport == ntohs(0x5678));

        ATF_CHECK(u->uh_dport == ntohs(0x1234));



        /* try again */

        u = set_udp(p, 0x5678, 0xabcd);

        UNNAT_CHECK(p, ext, masq, prv3);

        ATF_CHECK(u->uh_sport == ntohs(0x5678));

        ATF_CHECK(u->uh_dport == ntohs(0x1234));



        /* different source */

        u = set_udp(p, 0x5678, 0xabcd);

        UNNAT_CHECK(p, pub, masq, prv3);

        ATF_CHECK(u->uh_sport == ntohs(0x5678));

        ATF_CHECK(u->uh_dport == ntohs(0x1234));

        u = set_udp(p, 0xdead, 0xabcd);

        UNNAT_FAIL(p, ext, masq);



        /* clear table by keeping the address */

        LibAliasSetAddress(la, ext);

        LibAliasSetAddress(la, masq);



        LibAliasRedirectDelete(la, pf3);

        /* try again, but not the existing flow */

        u = set_udp(p, 0x5678, 0xabcd);

        UNNAT_FAIL(p, ext, masq);



        /*

         * Any external host, any port

         */

        pf4 = LibAliasRedirectPort(la, cgn, ntohs(0x1234), ANY_ADDR, ntohs(0), masq, ntohs(0xabcd), IPPROTO_UDP);

        ATF_REQUIRE(pf4 != NULL);



        u = set_udp(p, 0x5678, 0xabcd);

        UNNAT_CHECK(p, ext, masq, cgn);

        ATF_CHECK(u->uh_sport == ntohs(0x5678));

        ATF_CHECK(u->uh_dport == ntohs(0x1234));



        /* try again */

        u = set_udp(p, 0x5678, 0xabcd);

        UNNAT_CHECK(p, ext, masq, cgn);

        ATF_CHECK(u->uh_sport == ntohs(0x5678));

        ATF_CHECK(u->uh_dport == ntohs(0x1234));



        /* different source */

        u = set_udp(p, 0x5678, 0xabcd);

        UNNAT_CHECK(p, pub, masq, cgn);

        ATF_CHECK(u->uh_sport == ntohs(0x5678));

        ATF_CHECK(u->uh_dport == ntohs(0x1234));

        u = set_udp(p, 0xdead, 0xabcd);

        UNNAT_CHECK(p, ext, masq, cgn);

        ATF_CHECK(u->uh_sport == ntohs(0xdead));

        ATF_CHECK(u->uh_dport == ntohs(0x1234));



        /* clear table by keeping the address */

        LibAliasSetAddress(la, ext);

        LibAliasSetAddress(la, masq);



        LibAliasRedirectDelete(la, pf4);

        /* try again, but not the existing flow */

        u = set_udp(p, 0x5678, 0xabcd);

        UNNAT_FAIL(p, ext, masq);



        free(p);

        LibAliasUninit(la);

}



ATF_TC_WITHOUT_HEAD(2_portoverlap);

ATF_TC_BODY(2_portoverlap, dummy)

{

        struct libalias *la = LibAliasInit(NULL);

        struct alias_link *pf1, *pf2, *pf3, *pf4;

        struct ip *p;

        struct udphdr *u;



        ATF_REQUIRE(la != NULL);

        LibAliasSetAddress(la, masq);

        LibAliasSetMode(la, PKT_ALIAS_RESET_ON_ADDR_CHANGE, ~0);

        LibAliasSetMode(la, PKT_ALIAS_DENY_INCOMING, PKT_ALIAS_DENY_INCOMING);



        /*

         * Fully specified

         */

        pf1 = LibAliasRedirectPort(la, prv2, ntohs(0x1234), ext, ntohs(0x5678), masq, ntohs(0xabcd), IPPROTO_UDP);

        ATF_REQUIRE(pf1 != NULL);



        p = ip_packet(0, 64);

        UDP_UNNAT_CHECK(p, u, ext, 0x5678, masq, 0xabcd, prv2, 0x1234);



        /* clear table by keeping the address */

        LibAliasSetAddress(la, ext);

        LibAliasSetAddress(la, masq);



        /*

         * Fully specified (override)

         */

        pf1 = LibAliasRedirectPort(la, prv1, ntohs(0x1234), ext, ntohs(0x5678), masq, ntohs(0xabcd), IPPROTO_UDP);

        ATF_REQUIRE(pf1 != NULL);



        UDP_UNNAT_CHECK(p, u, ext, 0x5678, masq, 0xabcd, prv1, 0x1234);



        /* clear table by keeping the address */

        LibAliasSetAddress(la, ext);

        LibAliasSetAddress(la, masq);



        /*

         * Any external port

         */

        pf2 = LibAliasRedirectPort(la, prv2, ntohs(0x1234), ext, ntohs(0), masq, ntohs(0xabcd), IPPROTO_UDP);

        ATF_REQUIRE(pf2 != NULL);



        UDP_UNNAT_CHECK(p, u, ext, 0x5679, masq, 0xabcd, prv2, 0x1234);

        /* more specific rule wins */

        UDP_UNNAT_CHECK(p, u, ext, 0x5678, masq, 0xabcd, prv1, 0x1234);



        /* clear table by keeping the address */

        LibAliasSetAddress(la, ext);

        LibAliasSetAddress(la, masq);



        /*

         * Any external host

         */

        pf3 = LibAliasRedirectPort(la, prv3, ntohs(0x1234), ANY_ADDR, ntohs(0x5678), masq, ntohs(0xabcd), IPPROTO_UDP);

        ATF_REQUIRE(pf3 != NULL);



        UDP_UNNAT_CHECK(p, u, pub, 0x5678, masq, 0xabcd, prv3, 0x1234);

        /* more specific rule wins */

        UDP_UNNAT_CHECK(p, u, ext, 0x5679, masq, 0xabcd, prv2, 0x1234);

        UDP_UNNAT_CHECK(p, u, ext, 0x5678, masq, 0xabcd, prv1, 0x1234);



        /* clear table by keeping the address */

        LibAliasSetAddress(la, ext);

        LibAliasSetAddress(la, masq);



        /*

         * Any external host, any port

         */

        pf4 = LibAliasRedirectPort(la, cgn, ntohs(0x1234), ANY_ADDR, ntohs(0), masq, ntohs(0xabcd), IPPROTO_UDP);

        ATF_REQUIRE(pf4 != NULL);



        UDP_UNNAT_CHECK(p, u, prv1, 0x5679, masq, 0xabcd, cgn, 0x1234);

        /* more specific rule wins */

        UDP_UNNAT_CHECK(p, u, pub, 0x5678, masq, 0xabcd, prv3, 0x1234);

        UDP_UNNAT_CHECK(p, u, ext, 0x5679, masq, 0xabcd, prv2, 0x1234);

        UDP_UNNAT_CHECK(p, u, ext, 0x5678, masq, 0xabcd, prv1, 0x1234);



        free(p);

        LibAliasUninit(la);

}



ATF_TP_ADD_TCS(natin)

{

        /* Use "dd if=/dev/random bs=2 count=1 | od -x" to reproduce */

        srand(0xe859);



        ATF_TP_ADD_TC(natin, 1_portforward);

        ATF_TP_ADD_TC(natin, 2_portoverlap);



        return atf_no_error();

}