Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of ssh://git.nic.cz/projects/bird/GIT/bird

Browse source
This commit is contained in:
Ondrej Filip 2010-01-08 21:19:03 +01:00
commit 844e0f65db
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/socket.h
View file

@ -83,18 +83,23 @@ sk_send_buffer_empty(sock *sk)
#define SK_TCP_PASSIVE 0 /* ? * - - - ? - */ #define SK_TCP_PASSIVE 0 /* ? * - - - ? - */
#define SK_TCP_ACTIVE 1 /* ? ? * * - ? - */ #define SK_TCP_ACTIVE 1 /* ? ? * * - ? - */
#define SK_TCP 2 #define SK_TCP 2
#define SK_UDP 3 /* ? ? - - - ? ? */ #define SK_UDP 3 /* ? ? ? ? ? ? ? */
#define SK_IP 5 /* ? - - * - ? ? */ #define SK_IP 5 /* ? - ? * ? ? ? */
#define SK_MAGIC 7 /* Internal use by sysdep code */ #define SK_MAGIC 7 /* Internal use by sysdep code */
#define SK_UNIX_PASSIVE 8 #define SK_UNIX_PASSIVE 8
#define SK_UNIX 9 #define SK_UNIX 9
/* /*
* Multicast sockets are slightly different from the other ones: * For SK_UDP or SK_IP sockets setting DA/DP allows to use sk_send(),
* If you want to send packets only, just set the destination * otherwise sk_send_to() must be used.
* address to the corresponding multicast group and iface to *
* the interface to be used. If you also want receiving, set * For SK_IP sockets setting DP specifies protocol number, which is used
* source address to the same multicast group as well. * for both receiving and sending.
*
* For multicast on SK_UDP or SK_IP sockets set IF and TTL,
* call sk_setup_multicast() to enable multicast on that socket,
* and then use sk_join_group() and sk_leave_group() to manage
* a set of received multicast groups.
*/ */
#endif #endif

2
proto/ospf/rt.h
View file

@ -22,7 +22,7 @@ typedef struct orta
In OSPFv2, ASBRs from another areas (that we know from rt-summary-lsa), In OSPFv2, ASBRs from another areas (that we know from rt-summary-lsa),
have just ORTA_ASBR in options, their real options are unknown */ have just ORTA_ASBR in options, their real options are unknown */
#define ORTA_ASBR OPT_RT_E #define ORTA_ASBR OPT_RT_E
#define ORTA_ABR OPT_RT_V #define ORTA_ABR OPT_RT_B
struct ospf_area *oa; struct ospf_area *oa;
u32 metric1; u32 metric1;
u32 metric2; u32 metric2;