/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: 2015-07-05 21:38:01 UTC
  • mto: This revision was merged to the branch mainline in revision 759.
  • Revision ID: teddy@recompile.se-20150705213801-pi8vk0ovlumuj826
plugin-helpers/mandos-client-iprouteadddel.c: Fix #include lines.
(main): Fix minor typo in error message.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin-helpers/mandos-client-iprouteadddel.c
24
24
 
25
25
#define _GNU_SOURCE             /* asprintf(),
26
26
                                   program_invocation_short_name */
27
 
#include <iso646.h>             /* not, or, and */
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
  }