diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-09-06 09:32:10 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-09-06 09:32:10 +0000 |
commit | 4d62fbb184b0b5d0c80c4fec8bd13a0828fab8b9 (patch) | |
tree | a0ff652ee40b674f321801b410716a102b8bb871 /ext | |
parent | 2e5674c2abc08353d61a12da243103a44d5f569f (diff) |
010906
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@1741 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r-- | ext/digest/MANIFEST | 19 | ||||
-rw-r--r-- | ext/socket/socket.c | 188 |
2 files changed, 183 insertions, 24 deletions
diff --git a/ext/digest/MANIFEST b/ext/digest/MANIFEST index bf7cfefce3..e379b30d22 100644 --- a/ext/digest/MANIFEST +++ b/ext/digest/MANIFEST @@ -7,5 +7,24 @@ digest.txt.ja extconf.rb lib/md5.rb lib/sha1.rb +md5/extconf.rb +md5/md5.c +md5/md5.h +md5/md5init.c +rmd160/extconf.rb +rmd160/rmd160.c +rmd160/rmd160.h +rmd160/rmd160hl.c +rmd160/rmd160init.c +sha1/extconf.rb +sha1/sha1.c +sha1/sha1.h +sha1/sha1hl.c +sha1/sha1init.c +sha2/extconf.rb +sha2/sha2.c +sha2/sha2.h +sha2/sha2hl.c +sha2/sha2init.c test.rb test.sh diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 5981659449..87f2aede8b 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -488,6 +488,8 @@ s_recvfrom(sock, argc, argv, from) #endif case RECV_SOCKET: return rb_assoc_new(str, rb_tainted_str_new(buf, alen)); + default: + rb_bug("s_recvfrom called with bad value"); } } @@ -782,6 +784,8 @@ ruby_connect(fd, sockaddr, len, socks) errno = 0; break; #endif + default: + break; } } #ifdef HAVE_FCNTL @@ -1532,7 +1536,7 @@ static VALUE sock_s_socketpair(class, domain, type, protocol) VALUE class, domain, type, protocol; { -#if !defined(NT) && !defined(__BEOS__) && !defined(__EMX__) +#if !defined(NT) && !defined(__BEOS__) && !defined(__EMX__) && !defined(__QNXNTO__) int d, t, sp[2]; setup_domain_and_type(domain, &d, type, &t); @@ -2214,6 +2218,165 @@ Init_socket() sock_define_const("SOL_UDP", SOL_UDP); #endif +#ifdef IPPROTO_IP + sock_define_const("IPPROTO_IP", IPPROTO_IP); +#else + sock_define_const("IPPROTO_IP", 0); +#endif +#ifdef IPPROTO_ICMP + sock_define_const("IPPROTO_ICMP", IPPROTO_ICMP); +#else + sock_define_const("IPPROTO_ICMP", 1); +#endif +#ifdef IPPROTO_IGMP + sock_define_const("IPPROTO_IGMP", IPPROTO_IGMP); +#endif +#ifdef IPPROTO_GGP + sock_define_const("IPPROTO_GGP", IPPROTO_GGP); +#endif +#ifdef IPPROTO_TCP + sock_define_const("IPPROTO_TCP", IPPROTO_TCP); +#else + sock_define_const("IPPROTO_TCP", 6); +#endif +#ifdef IPPROTO_EGP + sock_define_const("IPPROTO_EGP", IPPROTO_EGP); +#endif +#ifdef IPPROTO_PUP + sock_define_const("IPPROTO_PUP", IPPROTO_PUP); +#endif +#ifdef IPPROTO_UDP + sock_define_const("IPPROTO_UDP", IPPROTO_UDP); +#else + sock_define_const("IPPROTO_UDP", 17); +#endif +#ifdef IPPROTO_IDP + sock_define_const("IPPROTO_IDP", IPPROTO_IDP); +#endif +#ifdef IPPROTO_HELLO + sock_define_const("IPPROTO_HELLO", IPPROTO_HELLO); +#endif +#ifdef IPPROTO_ND + sock_define_const("IPPROTO_ND", IPPROTO_ND); +#endif +#ifdef IPPROTO_TP + sock_define_const("IPPROTO_TP", IPPROTO_TP); +#endif +#ifdef IPPROTO_XTP + sock_define_const("IPPROTO_XTP", IPPROTO_XTP); +#endif +#ifdef IPPROTO_EON + sock_define_const("IPPROTO_EON", IPPROTO_EON); +#endif +#ifdef IPPROTO_BIP + sock_define_const("IPPROTO_BIP", IPPROTO_BIP); +#endif +/**/ +#ifdef IPPROTO_RAW + sock_define_const("IPPROTO_RAW", IPPROTO_RAW); +#else + sock_define_const("IPPROTO_RAW", 255); +#endif +#ifdef IPPROTO_MAX + sock_define_const("IPPROTO_MAX", IPPROTO_MAX); +#endif + + /* Some port configuration */ +#ifdef IPPORT_RESERVED + sock_define_const("IPPORT_RESERVED", IPPORT_RESERVED); +#else + sock_define_const("IPPORT_RESERVED", 1024); +#endif +#ifdef IPPORT_USERRESERVED + sock_define_const("IPPORT_USERRESERVED", IPPORT_USERRESERVED); +#else + sock_define_const("IPPORT_USERRESERVED", 5000); +#endif + /* Some reserved IP v.4 addresses */ +#ifdef INADDR_ANY + sock_define_const("INADDR_ANY", INADDR_ANY); +#else + sock_define_const("INADDR_ANY", 0x00000000); +#endif +#ifdef INADDR_BROADCAST + sock_define_const("INADDR_BROADCAST", INADDR_BROADCAST); +#else + sock_define_const("INADDR_BROADCAST", 0xffffffff); +#endif +#ifdef INADDR_LOOPBACK + sock_define_const("INADDR_LOOPBACK", INADDR_LOOPBACK); +#else + sock_define_const("INADDR_LOOPBACK", 0x7F000001); +#endif +#ifdef INADDR_UNSPEC_GROUP + sock_define_const("INADDR_UNSPEC_GROUP", INADDR_UNSPEC_GROUP); +#else + sock_define_const("INADDR_UNSPEC_GROUP", 0xe0000000); +#endif +#ifdef INADDR_ALLHOSTS_GROUP + sock_define_const("INADDR_ALLHOSTS_GROUP", INADDR_ALLHOSTS_GROUP); +#else + sock_define_const("INADDR_ALLHOSTS_GROUP", 0xe0000001); +#endif +#ifdef INADDR_MAX_LOCAL_GROUP + sock_define_const("INADDR_MAX_LOCAL_GROUP", INADDR_MAX_LOCAL_GROUP); +#else + sock_define_const("INADDR_MAX_LOCAL_GROUP", 0xe00000ff); +#endif +#ifdef INADDR_NONE + sock_define_const("INADDR_NONE", INADDR_NONE); +#else + sock_define_const("INADDR_NONE", 0xffffffff); +#endif + /* IP [gs]etsockopt options */ +#ifdef IP_OPTIONS + sock_define_const("IP_OPTIONS", IP_OPTIONS); +#endif +#ifdef IP_HDRINCL + sock_define_const("IP_HDRINCL", IP_HDRINCL); +#endif +#ifdef IP_TOS + sock_define_const("IP_TOS", IP_TOS); +#endif +#ifdef IP_TTL + sock_define_const("IP_TTL", IP_TTL); +#endif +#ifdef IP_RECVOPTS + sock_define_const("IP_RECVOPTS", IP_RECVOPTS); +#endif +#ifdef IP_RECVRETOPTS + sock_define_const("IP_RECVRETOPTS", IP_RECVRETOPTS); +#endif +#ifdef IP_RECVDSTADDR + sock_define_const("IP_RECVDSTADDR", IP_RECVDSTADDR); +#endif +#ifdef IP_RETOPTS + sock_define_const("IP_RETOPTS", IP_RETOPTS); +#endif +#ifdef IP_MULTICAST_IF + sock_define_const("IP_MULTICAST_IF", IP_MULTICAST_IF); +#endif +#ifdef IP_MULTICAST_TTL + sock_define_const("IP_MULTICAST_TTL", IP_MULTICAST_TTL); +#endif +#ifdef IP_MULTICAST_LOOP + sock_define_const("IP_MULTICAST_LOOP", IP_MULTICAST_LOOP); +#endif +#ifdef IP_ADD_MEMBERSHIP + sock_define_const("IP_ADD_MEMBERSHIP", IP_ADD_MEMBERSHIP); +#endif +#ifdef IP_DROP_MEMBERSHIP + sock_define_const("IP_DROP_MEMBERSHIP", IP_DROP_MEMBERSHIP); +#endif +#ifdef IP_DEFAULT_MULTICAST_TTL + sock_define_const("IP_DEFAULT_MULTICAST_TTL", IP_DEFAULT_MULTICAST_TTL); +#endif +#ifdef IP_DEFAULT_MULTICAST_LOOP + sock_define_const("IP_DEFAULT_MULTICAST_LOOP", IP_DEFAULT_MULTICAST_LOOP); +#endif +#ifdef IP_MAX_MEMBERSHIPS + sock_define_const("IP_MAX_MEMBERSHIPS", IP_MAX_MEMBERSHIPS); +#endif #ifdef SO_DEBUG sock_define_const("SO_DEBUG", SO_DEBUG); #endif @@ -2306,29 +2469,6 @@ Init_socket() sock_define_const("SOPRI_BACKGROUND", SOPRI_BACKGROUND); #endif -#ifdef IP_MULTICAST_IF - sock_define_const("IP_MULTICAST_IF", IP_MULTICAST_IF); -#endif -#ifdef IP_MULTICAST_TTL - sock_define_const("IP_MULTICAST_TTL", IP_MULTICAST_TTL); -#endif -#ifdef IP_MULTICAST_LOOP - sock_define_const("IP_MULTICAST_LOOP", IP_MULTICAST_LOOP); -#endif -#ifdef IP_ADD_MEMBERSHIP - sock_define_const("IP_ADD_MEMBERSHIP", IP_ADD_MEMBERSHIP); -#endif - -#ifdef IP_DEFAULT_MULTICAST_TTL - sock_define_const("IP_DEFAULT_MULTICAST_TTL", IP_DEFAULT_MULTICAST_TTL); -#endif -#ifdef IP_DEFAULT_MULTICAST_LOOP - sock_define_const("IP_DEFAULT_MULTICAST_LOOP", IP_DEFAULT_MULTICAST_LOOP); -#endif -#ifdef IP_MAX_MEMBERSHIPS - sock_define_const("IP_MAX_MEMBERSHIPS", IP_MAX_MEMBERSHIPS); -#endif - #ifdef IPX_TYPE sock_define_const("IPX_TYPE", IPX_TYPE); #endif |