diff options
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | inet/netinet/in.h | 23 | ||||
| -rw-r--r-- | localedata/ChangeLog | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/bits/in.h | 12 |
4 files changed, 34 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index c4c63ec767..4bf6b7ca1b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ * inet/netinet/in.h: Define struct ip_mreq and struct ip_mreq_source. + Define struct group_req and struct group_source_req. * sysdeps/unix/sysv/linux/bits/in.h: Define IP_UNBLOCK_SOURCE, IP_BLOCK_SOURCE, IP_ADD_SOURCE_MEMBERSHIP, IP_DROP_SOURCE_MEMBERSHIP, IP_MSFILTER, MCAST_JOIN_GROUP, diff --git a/inet/netinet/in.h b/inet/netinet/in.h index 7ec6741eb1..6aee842530 100644 --- a/inet/netinet/in.h +++ b/inet/netinet/in.h @@ -273,6 +273,29 @@ struct ipv6_mreq }; +/* Multicast group request. */ +struct group_req + { + /* Interface index. */ + uint32_t gr_interface; + + /* Group address. */ + struct sockaddr_storage gr_group; + }; + +struct group_source_req + { + /* Interface index. */ + uint32_t gsr_interface; + + /* Group address. */ + struct sockaddr_storage gsr_group; + + /* Source address. */ + struct sockaddr_storage gsr_source; + }; + + /* Get system-specific definitions. */ #include <bits/in.h> diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 282abc1256..7ce3d10858 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,7 @@ +2004-07-17 Petter Reinholdtsen <pere@hungry.com> + + * charmaps/IBM874: Add new alias WINDOWS-874 for IBM874 [BZ #244]. + 2004-05-18 Petter Reinholdtsen <pere@hungry.com> * locales/sl_SI [LC_TIME]: Correct d_fmt date format from diff --git a/sysdeps/unix/sysv/linux/bits/in.h b/sysdeps/unix/sysv/linux/bits/in.h index 5842c7c873..d92619630a 100644 --- a/sysdeps/unix/sysv/linux/bits/in.h +++ b/sysdeps/unix/sysv/linux/bits/in.h @@ -43,12 +43,12 @@ #define IP_ADD_SOURCE_MEMBERSHIP 39 /* ip_mreq_source: join source group */ #define IP_DROP_SOURCE_MEMBERSHIP 40 /* ip_mreq_source: leave source group */ #define IP_MSFILTER 41 -#define MCAST_JOIN_GROUP 42 -#define MCAST_BLOCK_SOURCE 43 -#define MCAST_UNBLOCK_SOURCE 44 -#define MCAST_LEAVE_GROUP 45 -#define MCAST_JOIN_SOURCE_GROUP 46 -#define MCAST_LEAVE_SOURCE_GROUP 47 +#define MCAST_JOIN_GROUP 42 /* group_req: join any-source group */ +#define MCAST_BLOCK_SOURCE 43 /* group_source_req: block from given group */ +#define MCAST_UNBLOCK_SOURCE 44 /* group_source_req: unblock from given group*/ +#define MCAST_LEAVE_GROUP 45 /* group_req: leave any-source group */ +#define MCAST_JOIN_SOURCE_GROUP 46 /* group_source_req: join source-spec gr */ +#define MCAST_LEAVE_SOURCE_GROUP 47 /* group_source_req: leave source-spec gr*/ #define MCAST_MSFILTER 48 #define MCAST_EXCLUDE 0 |