Merge commit '6a8d3f1c1ffbd964e4d11b452c73e1ea70310af3' into integrated

Conflicts:

	configure.in
	lib/socket.h
	nest/protocol.h

diff --cc conf/confbase.Y
index 7a9cfa615058e5ee9dbc8c4a41783e7b24cb4851,b793acb0414742594194ccfad511d977289b8192..83037182906da3b3aa9800c77eaa639149751d8c
--- 1/conf/confbase.Y
--- 2/conf/confbase.Y
+++ b/conf/confbase.Y
@@@ -76,8 -73,9 +76,9 @@@ CF_DECL
  %type <iface> ipa_scope
  
  %type <i> expr bool pxlen
+ %type <i32> expr_us
  %type <time> datetime
 -%type <a> ipa
 +%type <a> ipa ipa_raw
  %type <px> prefix prefix_or_ipa
  %type <t> text_or_none
  

diff --cc configure.in
index db767ccf771639c84bcb5f7172ee6858376825d1,fc18657d6d9f6aa515d5980269e600566f460e6a..3b0f2e323e5faed3ee9927f11c2e6d8a3a332461
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -42,8 -44,20 +42,8 @@@ AC_SUBST(exedir
  AC_SUBST(srcdir_rel_mf)
  AC_SUBST(runtimedir)
  
- # all_protocols=bgp,ospf,pipe,radv,rip,static
 -if test "$enable_ipv6" = yes ; then
 -      ip=ipv6
 -      SUFFIX=6
 -      all_protocols=bfd,bgp,ospf,pipe,radv,rip,static
 -else
 -      ip=ipv4
 -      SUFFIX=""
 -      all_protocols=bfd,bgp,ospf,pipe,rip,static
 -fi
 -
 -if test "$given_suffix" = yes ; then
 -      SUFFIX="$with_suffix"
 -fi
 -AC_SUBST(SUFFIX)
++# all_protocols=bfd,bgp,ospf,pipe,radv,rip,static
 +all_protocols=pipe,radv,rip,static
  
  if test "$with_protocols" = all ; then
        with_protocols="$all_protocols"

diff --cc lib/socket.h
index 5f642fc90bf44b9c3ea2a26731066ceaaccd5bfc,780d596bfe5fdf946589087ea6c171535fb32bf3..a1d8611bd66ad8826e012bd5e121bdb317674bf1
--- 1/lib/socket.h
--- 2/lib/socket.h
+++ b/lib/socket.h
@@@ -45,7 -44,7 +45,8 @@@ typedef struct birdsock 
    /* laddr and lifindex are valid only if SKF_LADDR_RX flag is set to request it */
  
    int fd;                             /* System-dependent data */
 +  int af;                             /* Address family (AF_INET, AF_INET6 or 0 for non-IP) of fd */
+   int index;                          /* Index in poll buffer */
    node n;
    void *rbuf_alloc, *tbuf_alloc;
    char *password;                             /* Password for MD5 authentication */
@@@ -89,12 -87,12 +90,13 @@@ extern int sk_priority_control;    /* Sugg
  
  /* Socket flags */
  
 -#define SKF_V6ONLY    1       /* Use IPV6_V6ONLY socket option */
 -#define SKF_LADDR_RX  2       /* Report local address for RX packets */
 -#define SKF_LADDR_TX  4       /* Allow to specify local address for TX packets */
 -#define SKF_TTL_RX    8       /* Report TTL / Hop Limit for RX packets */
 +#define SKF_V4ONLY    0x01    /* Use IPv4 for IP sockets */
 +#define SKF_V6ONLY    0x02    /* Use IPV6_V6ONLY socket option */
 +#define SKF_LADDR_RX  0x04    /* Report local address for RX packets */
 +#define SKF_LADDR_TX  0x08    /* Allow to specify local address for TX packets */
 +#define SKF_TTL_RX    0x10    /* Report TTL / Hop Limit for RX packets */
  
+ #define SKF_THREAD    0x100   /* Socked used in thread, Do not add to main loop */
  
  /*
   *    Socket types                 SA SP DA DP IF  TTL SendTo (?=may, -=must not, *=must)

diff --cc nest/proto.c
Simple merge

diff --cc nest/protocol.h
index 7bacdbb3352c2899ff51dcdf550bdd85d3a00f1e,969234473417194e38bd53ed2715fb7cbf7c55e7..21a5633644f693673e4dcc6a7eb71444cc857a62
--- 1/nest/protocol.h
--- 2/nest/protocol.h
+++ b/nest/protocol.h
@@@ -75,8 -74,8 +75,8 @@@ void protos_dump_all(void)
   */
  
  extern struct protocol
 -  proto_device, proto_radv, proto_rip, proto_static,
 +  proto_device, proto_radv, proto_rip, proto_ripng, proto_static,
-   proto_ospf, proto_pipe, proto_bgp;
+   proto_ospf, proto_pipe, proto_bgp, proto_bfd;
  
  /*
   *    Routing Protocol Instance

diff --cc proto/ospf/topology.c
Simple merge

diff --cc proto/rip/rip.c
Simple merge

diff --cc sysdep/config.h
Simple merge

diff --cc sysdep/unix/io.c
Simple merge