← Back to branch summary

~ubuntu-branches/ubuntu/quantal/iproute/quantal-updates

« back to all changes in this revision

Viewing changes to ip/xfrm_policy.c

  • Committer: Package Import Robot
  • Author(s): Andreas Henriksson, Alexander Wirt, Andreas Henriksson
  • Date: 2011-07-04 14:23:33 UTC
  • mfrom: (1.1.13 upstream) (23.1.6 sid)
  • Revision ID: package-import@ubuntu.com-20110704142333-je1iwihg5qsbe743
Tags: 20110629-1
http://bugs.debian.org/627312
[ Alexander Wirt ]
* Install ss to /bin instead of /sbin.

[ Andreas Henriksson ]
* Imported Upstream version 2.6.39 (aka snapshot 20110629)
  - tc filter: fix dport/sport in pretty print output (Closes: #627312)
* Finally drop the patch adding the wrr qdisc scheduler to tc
* Fix txtdocs patch to apply again
* Add patch to build against xtables version 6

Show diffs side-by-side

added added

removed removed

Lines of Context:
ip/xfrm_policy.c
77
77
        //fprintf(stderr, "PRIORITY - priority value(default=0)\n");
78
78
 
79
79
        fprintf(stderr, "FLAG-LIST := [ FLAG-LIST ] FLAG\n");
80
 
        fprintf(stderr, "FLAG := [ localok ]\n");
 
80
        fprintf(stderr, "FLAG := [ localok | icmp ]\n");
81
81
 
82
82
        fprintf(stderr, "LIMIT-LIST := [ LIMIT-LIST ] | [ limit LIMIT ]\n");
83
83
        fprintf(stderr, "LIMIT := [ [time-soft|time-hard|time-use-soft|time-use-hard] SECONDS ] |\n");
156
156
                while (1) {
157
157
                        if (strcmp(*argv, "localok") == 0)
158
158
                                *flags |= XFRM_POLICY_LOCALOK;
 
159
                        else if (strcmp(*argv, "icmp") == 0)
 
160
                                *flags |= XFRM_POLICY_ICMP;
159
161
                        else {
160
162
                                PREV_ARG(); /* back track */
161
163
                                break;