npf and GRE

[Dima Veselov <kab00m%lich.phys.spbu.ru@localhost>]

Hello,

does anybody know if npf is capable to map IP traffic like
gre? I have usual setup on NetBSD router:

map $ext_if dynamic $acl_local -> $ext_ip

and try to run PPTP connection from Windows through it.
tcpdump on router show masked outside tcp pptp traffic and
noNAT gre traffic.

13:17:29.426144 IP 172.20.20.51 > 212.119.171.17: GREv1, call 4864, seq 9, length 37: LCP, Conf-Request (0x01), id 9, length 23
13:17:33.426104 IP 46.252.242.58.3936 > 212.119.171.17.1723: Flags [P.], seq 349:365, ack 189, win 32803, length 16: pptp CTRL_MSGTYPE=CCRQ CALL_ID(47049)

In ipfilter we had to add extra map to NAT non-tcp/udp traffic (even for icmp), does npf allow that?

Thanks in advance.

-- 
Sincerely yours,
Dima Veselov
Physics R&D Establishment of Saint-Petersburg University