/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to plugin-helpers/mandos-client-iprouteadddel.c

  • Committer: Teddy Hogeborn
  • Date: 2019-07-29 16:35:53 UTC
  • Revision ID: teddy@recompile.se-20190729163553-1i442i2cbx64c537
Make tests and man page examples match

Make the tests test_manual_page_example[1-5] match exactly what is
written in the manual page, and add comments to manual page as
reminders to keep tests and manual page examples in sync.

* mandos-ctl (Test_commands_from_options.test_manual_page_example_1):
  Remove "--verbose" option, since the manual does not have it as the
  first example, and change assertion to match.
* mandos-ctl.xml (EXAMPLE): Add comments to all examples documenting
  which test function they correspond to.  Also remove unnecessary
  quotes from option arguments in fourth example, and clarify language
  slightly in fifth example.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin-helpers/mandos-client-iprouteadddel.c
2
2
/* 
3
3
 * iprouteadddel - Add or delete direct route to a local IP address
4
4
 * 
5
 
 * Copyright © 2015 Teddy Hogeborn
6
 
 * Copyright © 2015 Björn Påhlsson
7
 
 * 
8
 
 * This program is free software: you can redistribute it and/or
9
 
 * modify it under the terms of the GNU General Public License as
10
 
 * published by the Free Software Foundation, either version 3 of the
11
 
 * License, or (at your option) any later version.
12
 
 * 
13
 
 * This program is distributed in the hope that it will be useful, but
 
5
 * Copyright © 2015-2018 Teddy Hogeborn
 
6
 * Copyright © 2015-2018 Björn Påhlsson
 
7
 * 
 
8
 * This file is part of Mandos.
 
9
 * 
 
10
 * Mandos is free software: you can redistribute it and/or modify it
 
11
 * under the terms of the GNU General Public License as published by
 
12
 * the Free Software Foundation, either version 3 of the License, or
 
13
 * (at your option) any later version.
 
14
 * 
 
15
 * Mandos is distributed in the hope that it will be useful, but
14
16
 * WITHOUT ANY WARRANTY; without even the implied warranty of
15
17
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
16
18
 * General Public License for more details.
17
19
 * 
18
20
 * You should have received a copy of the GNU General Public License
19
 
 * along with this program.  If not, see
20
 
 * <http://www.gnu.org/licenses/>.
 
21
 * along with Mandos.  If not, see <http://www.gnu.org/licenses/>.
21
22
 * 
22
23
 * Contact the authors at <mandos@recompile.se>.
23
24
 */
24
25
 
25
 
#define _GNU_SOURCE             /* asprintf(),
26
 
                                   program_invocation_short_name */
27
 
#include <iso646.h>             /* not, or, and */
 
26
#define _GNU_SOURCE             /* program_invocation_short_name */
28
27
#include <stdbool.h>            /* bool, false, true */
29
 
#include <stdio.h>              /* vfprintf(), stderr, stdout */
 
28
#include <stdio.h>              /* fprintf(), stderr, FILE, vfprintf */
 
29
#include <errno.h>              /* program_invocation_short_name,
 
30
                                   errno, perror(), EINVAL, ENOMEM */
30
31
#include <stdarg.h>             /* va_list, va_start */
31
 
#include <errno.h>              /* perror(), errno,
32
 
                                   program_invocation_short_name */
 
32
#include <stdlib.h>             /* EXIT_SUCCESS */
33
33
#include <argp.h>               /* struct argp_option, error_t, struct
34
 
                                   argp_state, struct argp,
35
 
                                   argp_parse(), ARGP_KEY_ARG,
36
 
                                   ARGP_KEY_END, ARGP_ERR_UNKNOWN */
 
34
                                   argp_state, ARGP_KEY_ARG,
 
35
                                   argp_usage(), ARGP_KEY_END,
 
36
                                   ARGP_ERR_UNKNOWN, struct argp,
 
37
                                   argp_parse() */
 
38
#include <sysexits.h>           /* EX_USAGE, EX_OSERR */
 
39
#include <netinet/ip.h>         /* sa_family_t, AF_INET6, AF_INET */
37
40
#include <inttypes.h>           /* PRIdMAX, intmax_t */
38
 
#include <sysexits.h>           /* EX_OSERR */
39
41
 
40
 
/* #include <linux/netlink.h> */
41
 
/* #include <netlink/netlink.h> */
42
 
/* #include <netlink/socket.h> */
43
 
#include <netlink/netlink.h>
44
 
#include <netlink/socket.h>
45
 
#include <netlink/cache.h>
46
 
#include <netlink/route/link.h>  /* libnl xxx */
47
 
#include <netlink/route/route.h> /* libnl xxx */
 
42
#include <netlink/netlink.h>    /* struct nl_addr, nl_addr_parse(),
 
43
                                   nl_geterror(),
 
44
                                   nl_addr_get_family(),
 
45
                                   nl_addr_put() */
 
46
#include <netlink/route/route.h> /* struct rtnl_route,
 
47
                                    struct rtnl_nexthop,
 
48
                                    rtnl_route_alloc(),
 
49
                                    rtnl_route_set_family(),
 
50
                                    rtnl_route_set_protocol(),
 
51
                                    RTPROT_BOOT,
 
52
                                    rtnl_route_set_scope(),
 
53
                                    RT_SCOPE_LINK,
 
54
                                    rtnl_route_set_type(),
 
55
                                    RTN_UNICAST,
 
56
                                    rtnl_route_set_dst(),
 
57
                                    rtnl_route_set_table(),
 
58
                                    RT_TABLE_MAIN,
 
59
                                    rtnl_route_nh_alloc(),
 
60
                                    rtnl_route_nh_set_ifindex(),
 
61
                                    rtnl_route_add_nexthop(),
 
62
                                    rtnl_route_add(),
 
63
                                    rtnl_route_delete(),
 
64
                                    rtnl_route_put(),
 
65
                                    rtnl_route_nh_free() */
 
66
#include <netlink/socket.h>     /* struct nl_sock, nl_socket_alloc(),
 
67
                                   nl_connect(), nl_socket_free() */
 
68
#include <netlink/route/link.h> /* rtnl_link_get_kernel(),
 
69
                                   rtnl_link_get_ifindex(),
 
70
                                   rtnl_link_put() */
48
71
 
49
72
bool debug = false;
50
73
const char *argp_program_version = "mandos-client-iprouteadddel " VERSION;
208
231
  /* Create nexthop */
209
232
  nexthop = rtnl_route_nh_alloc();
210
233
  if(nexthop == NULL){
211
 
    fprintf_plus(stderr, "Failed to get netlink route nexthop:\n");
 
234
    fprintf_plus(stderr, "Failed to get netlink route nexthop\n");
212
235
    exitcode = EX_OSERR;
213
236
    goto end;
214
237
  }
220
243
  }
221
244
  /* Set interface index number on nexthop object */
222
245
  rtnl_route_nh_set_ifindex(nexthop, ifindex);
223
 
  /* Set route tu use nexthop object */
 
246
  /* Set route to use nexthop object */
224
247
  rtnl_route_add_nexthop(route, nexthop);
225
248
  /* Add or delete route? */
226
249
  if(arguments.add){