matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ndle DCCP in ipxfrm.c to allow using port numbers in the selector.

This commit is contained in:
shemminger 2006-01-12 18:31:36 +00:00
parent 97aa798a1c
commit 27356a5e00
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,7 @@
2006-01-12 Patrick McHardy <kaber@trash.net>
* Handle DCCP in ipxfrm.c to allow using port numbers in the selector.
2006-01-10 Masahide NAKAMURA <nakam@linux-ipv6.org>
* Add ip link ntable
@ -19,11 +23,11 @@
* Add corrupt feature to netem
2005-12-02 Stephen Hemminger <shemminger@osdl.org
2005-12-02 Stephen Hemminger <shemminger@osdl.org>
* Backout ambigious ip command matches
2005-11-22 Stephen Hemminger <shemminger@osdl.org
2005-11-22 Stephen Hemminger <shemminger@osdl.org>
* Handle ambigious ip command matches

2
ip/ipxfrm.c
View File

@ -445,6 +445,7 @@ void xfrm_selector_print(struct xfrm_selector *sel, __u16 family,
case IPPROTO_TCP:
case IPPROTO_UDP:
case IPPROTO_SCTP:
case IPPROTO_DCCP:
default: /* XXX */
if (sel->sport_mask)
fprintf(fp, "sport %u ", ntohs(sel->sport));
@ -999,6 +1000,7 @@ static int xfrm_selector_upspec_parse(struct xfrm_selector *sel,
case IPPROTO_TCP:
case IPPROTO_UDP:
case IPPROTO_SCTP:
case IPPROTO_DCCP:
break;
default:
fprintf(stderr, "\"sport\" and \"dport\" are invalid with proto=%s\n", strxf_proto(sel->proto));

3
ip/xfrm.h
View File

@ -32,6 +32,9 @@
#ifndef IPPROTO_SCTP
# define IPPROTO_SCTP 132
#endif
#ifndef IPPPROTO_DCCP
# define IPPROTO_DCCP 33
#endif
#define XFRMS_RTA(x) ((struct rtattr*)(((char*)(x)) + NLMSG_ALIGN(sizeof(struct xfrm_usersa_info))))
#define XFRMS_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct xfrm_usersa_info))