← Back to branch summary

~ubuntu-branches/ubuntu/precise/iproute/precise

« back to all changes in this revision

Viewing changes to ip/ip.c

  • Committer: Bazaar Package Importer
  • Author(s): Alexander Wirt, Andreas Henriksson, Justin B Rye, Alexander Wirt
  • Date: 2008-05-11 11:18:29 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20080511111829-rfewew7s6kiev0bh
Tags: 20080417-1
http://bugs.debian.org/467557
http://bugs.debian.org/480173
http://bugs.debian.org/464521
[ Andreas Henriksson ]
* New upstream release, v2.6.25 a.k.a. snapshot 20080417.
  - Initial documentation for xfrm (Partially fixes #451337)
  - Fixes manpage error caught by lintian!
* Fix typos (syntax error) in ip(8) manpage.
  - Introduced by upstream, caught by lintian yet again!
* Don't ship useless headers in iproute-dev (Closes: #467557)
* Cherry-pick "Fix bad hash calculation because of signed address" from
  upstream. (Closes: #480173)

[ Justin B Rye ]
* Update package description (Closes: #464521)

[ Alexander Wirt ]
* Fix typo in short package description.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ip/ip.c
46
46
        fprintf(stderr,
47
47
"Usage: ip [ OPTIONS ] OBJECT { COMMAND | help }\n"
48
48
"       ip [ -force ] [-batch filename\n"
49
 
"where  OBJECT := { link | addr | route | rule | neigh | ntable | tunnel |\n"
50
 
"                   maddr | mroute | monitor | xfrm }\n"
 
49
"where  OBJECT := { link | addr | addrlabel | route | rule | neigh | ntable |\n"
 
50
"                   tunnel | maddr | mroute | monitor | xfrm }\n"
51
51
"       OPTIONS := { -V[ersion] | -s[tatistics] | -d[etails] | -r[esolve] |\n"
52
52
"                    -f[amily] { inet | inet6 | ipx | dnet | link } |\n"
53
53
"                    -o[neline] | -t[imestamp] }\n");
64
64
        int (*func)(int argc, char **argv);
65
65
} cmds[] = {
66
66
        { "address",    do_ipaddr },
 
67
        { "addrlabel",  do_ipaddrlabel },
67
68
        { "maddress",   do_multiaddr },
68
69
        { "route",      do_iproute },
69
70
        { "rule",       do_iprule },
103
104
 
104
105
        if (name && strcmp(name, "-") != 0) {
105
106
                if (freopen(name, "r", stdin) == NULL) {
106
 
                        fprintf(stderr, "Cannot open file \"%s\" for reading: %s=n",
 
107
                        fprintf(stderr, "Cannot open file \"%s\" for reading: %s\n",
107
108
                                name, strerror(errno));
108
109
                        return -1;
109
110
                }