Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | The following changes were made: - added IPV6 support - enhanced reuse option for use on all platforms - refactored get/set option functions - enhanced mcastadd/drop option to be able to specify network interface All changes were tested on Windows XP, Linux and macosx (maverick). Units tests were extended. Documentation was updated. |
---|---|
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
220bbfdfff18f581dfa1161541413c0f |
User & Date: | huubeikens 2014-02-13 20:49:57.000 |
Context
2014-02-14
| ||
07:26 | Updated the man doc. check-in: 05a7d13c00 user: huubeikens tags: trunk | |
2014-02-13
| ||
20:49 | The following changes were made: - added IPV6 support - enhanced reuse option for use on all platforms - refactored get/set option functions - enhanced mcastadd/drop option to be able to specify network interface All changes were tested on Windows XP, Linux and macosx (maverick). Units tests were extended. Documentation was updated. check-in: 220bbfdfff user: huubeikens tags: trunk | |
2014-01-10
| ||
19:32 | *** empty log message *** check-in: 06dddf7b46 user: huubeikens tags: trunk | |
Changes
Changes to README.
︙ | ︙ | |||
33 34 35 36 37 38 39 | about how to build the extension under Windows. We suggest using the Msys + Mingw build process since it is significantly easier than building with VC++ or Cygwin. This package includes a Visual Studio project file to help in building with VC++. | | > > > > > > > | 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 | about how to build the extension under Windows. We suggest using the Msys + Mingw build process since it is significantly easier than building with VC++ or Cygwin. This package includes a Visual Studio project file to help in building with VC++. The package has been built using both VC++6 and Msys + Mingw. Microsoft Platform SDK 2003 is required for building. The following minimal example will install the extension in the C:\Tcl\lib directory. $ cd tcludp/win $ nmake -f makefile.vc realclean all $ nmake -f makefile.vc install INSTALLDIR=C:\Tcl\lib FEEDBACK ======== If you have any problem with this extension, please contact Xiaotao Wu Name : Xiaotao Wu |
︙ | ︙ |
Changes to configure.
1 2 | #! /bin/sh # Guess values for system-dependent variables and create Makefiles. | | | 1 2 3 4 5 6 7 8 9 10 | #! /bin/sh # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for udp 1.0.10. # # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## |
︙ | ︙ | |||
263 264 265 266 267 268 269 | # This variable seems obsolete. It should probably be removed, and # only ac_max_sed_lines should be used. : ${ac_max_here_lines=38} # Identity of this package. PACKAGE_NAME='udp' PACKAGE_TARNAME='udp' | | | | 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 | # This variable seems obsolete. It should probably be removed, and # only ac_max_sed_lines should be used. : ${ac_max_here_lines=38} # Identity of this package. PACKAGE_NAME='udp' PACKAGE_TARNAME='udp' PACKAGE_VERSION='1.0.10' PACKAGE_STRING='udp 1.0.10' PACKAGE_BUGREPORT='' # Factoring default headers for most tests. ac_includes_default="\ #include <stdio.h> #if HAVE_SYS_TYPES_H # include <sys/types.h> |
︙ | ︙ | |||
773 774 775 776 777 778 779 | # # Report the --help message. # if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF | | | 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 | # # Report the --help message. # if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF \`configure' configures udp 1.0.10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... To assign environment variables (e.g., CC, CFLAGS...), specify them as VAR=VALUE. See below for descriptions of some of the useful variables. Defaults for the options are specified in brackets. |
︙ | ︙ | |||
830 831 832 833 834 835 836 | cat <<\_ACEOF _ACEOF fi if test -n "$ac_init_help"; then case $ac_init_help in | | | 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 | cat <<\_ACEOF _ACEOF fi if test -n "$ac_init_help"; then case $ac_init_help in short | recursive ) echo "Configuration of udp 1.0.10:";; esac cat <<\_ACEOF Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-threads build with threads |
︙ | ︙ | |||
961 962 963 964 965 966 967 | cd $ac_popdir done fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF | | | | 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 | cd $ac_popdir done fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF udp configure 1.0.10 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF exit 0 fi exec 5>config.log cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by udp $as_me 1.0.10, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ _ACEOF { cat <<_ASUNAME |
︙ | ︙ | |||
10536 10537 10538 10539 10540 10541 10542 | # file during the install process. Don't run the TCLSH_PROG through # ${CYGPATH} because it's being used directly by make. # Require that we use a tclsh shell version 8.2 or later since earlier # versions have bugs in the pkg_mkIndex routine. # Add WISH as well if this is a Tk extension. #-------------------------------------------------------------------- | < | > > > > | 10536 10537 10538 10539 10540 10541 10542 10543 10544 10545 10546 10547 10548 10549 10550 10551 10552 10553 10554 10555 10556 10557 10558 10559 10560 10561 10562 10563 10564 10565 10566 10567 10568 10569 10570 10571 10572 10573 10574 10575 10576 10577 10578 10579 | # file during the install process. Don't run the TCLSH_PROG through # ${CYGPATH} because it's being used directly by make. # Require that we use a tclsh shell version 8.2 or later since earlier # versions have bugs in the pkg_mkIndex routine. # Add WISH as well if this is a Tk extension. #-------------------------------------------------------------------- echo "$as_me:$LINENO: checking for tclsh" >&5 echo $ECHO_N "checking for tclsh... $ECHO_C" >&6 if test -f "${TCL_BIN_DIR}/Makefile" ; then # tclConfig.sh is in Tcl build directory if test "${TEA_PLATFORM}" = "windows"; then TCLSH_PROG="${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}${EXEEXT}" else TCLSH_PROG="${TCL_BIN_DIR}/tclsh" fi else # tclConfig.sh is in install location if test "${TEA_PLATFORM}" = "windows"; then TCLSH_PROG="tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}${EXEEXT}" else TCLSH_PROG="tclsh${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}${TCL_DBGX}" fi list="`ls -d ${TCL_BIN_DIR}/../bin 2>/dev/null` \ `ls -d ${TCL_BIN_DIR}/.. 2>/dev/null` \ `ls -d ${TCL_PREFIX}/bin 2>/dev/null`" for i in $list ; do if test -f "$i/${TCLSH_PROG}" ; then REAL_TCL_BIN_DIR="`cd "$i"; pwd`" break fi done TCLSH_PROG="${REAL_TCL_BIN_DIR}/${TCLSH_PROG}" if test "`uname -s`" = "Darwin"; then TCLSH_PROG="/usr/bin/tclsh" fi fi echo "$as_me:$LINENO: result: ${TCLSH_PROG}" >&5 echo "${ECHO_T}${TCLSH_PROG}" >&6 # ------------------------------------------------------------------- |
︙ | ︙ | |||
11068 11069 11070 11071 11072 11073 11074 | echo sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ## Running $as_me. ## _ASBOX } >&5 cat >&5 <<_CSEOF | | | 11071 11072 11073 11074 11075 11076 11077 11078 11079 11080 11081 11082 11083 11084 11085 | echo sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ## Running $as_me. ## _ASBOX } >&5 cat >&5 <<_CSEOF This file was extended by udp $as_me 1.0.10, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS CONFIG_LINKS = $CONFIG_LINKS CONFIG_COMMANDS = $CONFIG_COMMANDS $ $0 $@ |
︙ | ︙ | |||
11123 11124 11125 11126 11127 11128 11129 | $config_files Report bugs to <[email protected]>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ | | | 11126 11127 11128 11129 11130 11131 11132 11133 11134 11135 11136 11137 11138 11139 11140 | $config_files Report bugs to <[email protected]>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ udp config.status 1.0.10 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Copyright (C) 2003 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." srcdir=$srcdir |
︙ | ︙ |
Changes to doc/udp.man.
1 2 3 4 5 | [comment {-*- tcl -*- doctools manpage}] [comment {To convert this to another documentation format use the mpexpand script from tcllib: dtplite -o udp.n nroff udp.man dtplite -o udp.html html udp.man }] | | | | < | | > | > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 | [comment {-*- tcl -*- doctools manpage}] [comment {To convert this to another documentation format use the mpexpand script from tcllib: dtplite -o udp.n nroff udp.man dtplite -o udp.html html udp.man }] [manpage_begin udp n 1.0.10] [copyright {1999-2000 Columbia University; all rights reserved}] [moddesc {Tcl UDP extension}] [titledesc {Create UDP sockets in Tcl}] [require Tcl 8.2] [require udp 1.0] [description] This package provides support for using UDP through Tcl. The package provides a new channel type and attempts to permit the use of packet oriented UDP over stream oriented Tcl channels. The package defined three commands but [cmd udp_conf] should be considered depreciated in favour of the standard Tcl command [cmd fconfigure]. [section "COMMANDS"] [list_begin definitions] [call [cmd "udp_open"] [opt "[arg port]"] [opt "[arg reuse]"] [opt "[arg ipv6]"]] [cmd udp_open] will open a UDP socket. If [arg port] is specified the UDP socket will be opened on that port. Otherwise the system will choose a port and the user can use the [cmd udp_conf] command to obtain the port number if required. [nl] Additional argument may be provided. If [arg reuse] is specified the SO_REUSEADDR socket option is set which permits multiple sockets to be bound to the same address/port combination. By default a IPv4 socket is created. When [arg ipv6] is specified an IPv6 socket is created. [call [cmd "udp_conf"] [arg "sock"] [arg "host"] [arg "port"]] [emph Deprecated] in favour of the standard Tcl [cmd fconfigure] command. [nl] [cmd udp_conf] in this configuration is used to specify the remote destination for packets written to this [arg "sock"]. You must call this command before writing data to the UDP socket. [call [cmd "udp_conf"] [arg "sock"] [arg [opt -myport]] [arg [opt -remote]] [arg [opt -peer]] [arg [opt "-broadcast bool"]] \ [arg [opt "-ttl count"]] [arg [opt "-mcastadd \"groupaddr [opt netwif]\""]] [arg [opt "-mcastdrop \"groupaddr [opt netwif]\""]]\ [arg [opt -mcastgroups]] [arg [opt "-mcastloop bool"]]] [emph Deprecated] in favour of the standard Tcl [cmd fconfigure] command. [nl] In addition to being used to configure the remote host, the [cmd "udp_conf"] command is used to obtain information about the UDP socket. NOTE all these options are now available using the standard Tcl [cmd fconfigure] command. |
︙ | ︙ | |||
62 63 64 65 66 67 68 | Returns the remote hostname and port number for the packet most recently received by this socket. [lst_item "[arg -broadcast\ [opt boolean]]"] UDP packets can listen and send on the broadcast address. For some systems a flag must be set on the socket to use broadcast. With no argument this option will return the broadcast setting. With a | | > > > | | > > > > > > | > > | 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 | Returns the remote hostname and port number for the packet most recently received by this socket. [lst_item "[arg -broadcast\ [opt boolean]]"] UDP packets can listen and send on the broadcast address. For some systems a flag must be set on the socket to use broadcast. With no argument this option will return the broadcast setting. With a boolean argument the setting can be modified. This option is not permitted when using IPv6. [lst_item "[arg -ttl\ [opt count]]"] The time-to-live is given as the number of router hops the packet may do. For multicast packets this is important in specifying the distribution of the packet. The system default for multicast is 1 which restricts the packet to the local subnet. To permit packets to pass routers, you must increase the ttl. A value of 31 should keep it within a site, while 255 is global. [lst_item "[arg -mcastadd] groupaddr"] [lst_item "[arg -mcastadd] \"groupaddr netwif\""] [lst_item "[arg -mcastdrop] groupaddr"] [lst_item "[arg -mcastdrop] \"groupaddr netwif\""] [lst_item "[arg -mcastgroups]"] [package tcludp] sockets can support IPv4 and IPv6 multicast operations. To receive multicast packets the application has to notify the operating system that it should join a particular multicast group. For IPv4 these are specified as addresses in the range 224.0.0.0 to 239.255.255.255. [nl] When specifying only the [arg groupaddr] the system will determine the network interface to use. Specifying the [arg netwif] will join a multicast group on a specific network interface. This is useful on a multihomed system with multiple network interfaces. On windows you must specify the network interface index. For other platforms the network interface (e.g. 'eth0') name can be specified. [nl] To view the current set of multicast groups for a channel use [arg -mcastgroups] [lst_item "[arg -mcastloop\ [opt boolean]]"] With multicast udp the system can choose to receive packets that it has sent or it can drop them. This is known as multicast loopback and can be controlled using this option. By default the value is true and your application will receive its own transmissions. [list_end] [call [cmd "udp_peek"] [arg "sock"] [opt [arg "buffersize"]]] Examine a packet without removing it from the buffer. Option [arg buffersize] specifies the maximum buffer size. Value must be between 0 and 16. [nl] This function is not available on windows. [list_end] [section EXAMPLES] [para] [example { |
︙ | ︙ | |||
173 174 175 176 177 178 179 180 181 182 | the socket. In addition, it provides more configuration ability. [para] Enhancements to support binary data and to setup the package for the Tcl Extension Architecture by Pat Thoyts. [see_also socket(n)] [keywords udp socket networking] [manpage_end] | > > > | 186 187 188 189 190 191 192 193 194 195 196 197 198 | the socket. In addition, it provides more configuration ability. [para] Enhancements to support binary data and to setup the package for the Tcl Extension Architecture by Pat Thoyts. [para] Support for IPv6 and allowing a multicast join on a specific network interface is added by Huub Eikens. [see_also socket(n)] [keywords udp socket networking] [manpage_end] |
Changes to generic/udp_tcl.c.
1 2 3 4 5 6 7 8 9 | /****************************************************************************** * UDP Extension for Tcl 8.4 * * Copyright (c) 1999-2000 by Columbia University; all rights reserved * Copyright (c) 2003-2005 Pat Thoyts <[email protected]> * * Written by Xiaotao Wu * Last modified: 11/03/2000 * | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 | /****************************************************************************** * UDP Extension for Tcl 8.4 * * Copyright (c) 1999-2000 by Columbia University; all rights reserved * Copyright (c) 2003-2005 Pat Thoyts <[email protected]> * * Written by Xiaotao Wu * Last modified: 11/03/2000 * * $Id: udp_tcl.c,v 1.45 2014/02/13 20:49:57 huubeikens Exp $ ******************************************************************************/ #if defined(_DEBUG) && !defined(DEBUG) #define DEBUG #endif #include "udp_tcl.h" |
︙ | ︙ | |||
52 53 54 55 56 57 58 59 60 61 62 63 64 65 | * but we need it and TEA causes this macro to be defined. */ struct ip_mreq { struct in_addr imr_multiaddr; /* IP multicast address of group */ struct in_addr imr_interface; /* local IP address of interface */ }; #endif /* _XOPEN_SOURCE_EXTENDED */ /* define some Win32isms for Unix */ #ifndef WIN32 #define SOCKET int #define INVALID_SOCKET -1 #define closesocket close | > > > > > > | 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 | * but we need it and TEA causes this macro to be defined. */ struct ip_mreq { struct in_addr imr_multiaddr; /* IP multicast address of group */ struct in_addr imr_interface; /* local IP address of interface */ }; struct ipv6_mreq { struct in6_addr ipv6mr_multiaddr; /* IPv6 multicast addr */ unsigned int ipv6mr_interface; /* interface index */ }; #endif /* _XOPEN_SOURCE_EXTENDED */ /* define some Win32isms for Unix */ #ifndef WIN32 #define SOCKET int #define INVALID_SOCKET -1 #define closesocket close |
︙ | ︙ | |||
100 101 102 103 104 105 106 | int udpOpen(ClientData , Tcl_Interp *, int , CONST84 char * []); int udpConf(ClientData , Tcl_Interp *, int , CONST84 char * []); int udpPeek(ClientData , Tcl_Interp *, int , CONST84 char * []); /* * internal functions */ | | | > > > > > > > > > | 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 | int udpOpen(ClientData , Tcl_Interp *, int , CONST84 char * []); int udpConf(ClientData , Tcl_Interp *, int , CONST84 char * []); int udpPeek(ClientData , Tcl_Interp *, int , CONST84 char * []); /* * internal functions */ static int UdpMulticast(UdpState *statePtr, Tcl_Interp *, const char *, int); static int UdpSockGetPort(Tcl_Interp *interp, const char *s, const char *proto, int *portPtr); static void udpTrace(const char *format, ...); static int udpGetService(Tcl_Interp *interp, const char *service, unsigned short *servicePort); static Tcl_Obj *ErrorToObj(const char * prefix); static int hasOption(int argc, CONST84 char * argv[],const char* option ); static int udpSetRemoteOption(UdpState* statePtr, Tcl_Interp *interp, CONST84 char *newValue); static int udpSetMulticastAddOption(UdpState* statePtr, Tcl_Interp *interp, CONST84 char *newValue); static int udpSetMulticastDropOption(UdpState* statePtr, Tcl_Interp *interp, CONST84 char *newValue); static int udpSetBroadcastOption(UdpState* statePtr, Tcl_Interp *interp, CONST84 char *newValue); static int udpGetBroadcastOption(UdpState* statePtr, Tcl_Interp *interp, int* value); static int udpSetMcastloopOption(UdpState* statePtr, Tcl_Interp *interp, CONST84 char *newValue); static int udpGetMcastloopOption(UdpState *statePtr, Tcl_Interp *interp, unsigned char * value); static int udpSetTtlOption(UdpState* statePtr, Tcl_Interp *interp, CONST84 char *newValue); static int udpGetTtlOption(UdpState *statePtr, Tcl_Interp *interp,unsigned int *value); /* * Windows specific functions */ #ifdef WIN32 int UdpEventProc(Tcl_Event *evPtr, int flags); |
︙ | ︙ | |||
131 132 133 134 135 136 137 | #endif /* ! WIN32 */ /* * This structure describes the channel type for accessing UDP. */ static Tcl_ChannelType Udp_ChannelType = { | < < < < | 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 | #endif /* ! WIN32 */ /* * This structure describes the channel type for accessing UDP. */ static Tcl_ChannelType Udp_ChannelType = { "udp", /* Type name. */ NULL, /* Set blocking/nonblocking behaviour. NULL'able */ udpClose, /* Close channel, clean instance data */ udpInput, /* Handle read request */ udpOutput, /* Handle write request */ NULL, /* Move location of access point. NULL'able */ udpSetOption, /* Set options. NULL'able */ udpGetOption, /* Get options. NULL'able */ |
︙ | ︙ | |||
168 169 170 171 172 173 174 | Tcl_InitStubs(interp, "8.1", 0); #endif #ifdef WIN32 if (Udp_WinHasSockets(interp) != TCL_OK) { return TCL_ERROR; } | < | 179 180 181 182 183 184 185 186 187 188 189 190 191 192 | Tcl_InitStubs(interp, "8.1", 0); #endif #ifdef WIN32 if (Udp_WinHasSockets(interp) != TCL_OK) { return TCL_ERROR; } Tcl_CreateEventSource(UDP_SetupProc, UDP_CheckProc, NULL); #endif Tcl_CreateCommand(interp, "udp_open", udpOpen , (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL); Tcl_CreateCommand(interp, "udp_conf", udpConf , (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL); |
︙ | ︙ | |||
216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 | /* * Probably we should provide an equivalent to the C API for TCP. * * Tcl_Channel Tcl_OpenUdpClient(interp, port, host, myaddr, myport, async); * Tcl_Channel Tcl_OpenUdpServer(interp, port, myaddr, proc, clientData); * Tcl_Channel Tcl_MakeUdpClientChannel(sock); */ /* * ---------------------------------------------------------------------- * udpOpen -- * * opens a UDP socket and addds the file descriptor to the tcl * interpreter * ---------------------------------------------------------------------- */ int udpOpen(ClientData clientData, Tcl_Interp *interp, int argc, CONST84 char * argv[]) { int sock; char channelName[20]; UdpState *statePtr; uint16_t localport = 0; int reuse = 0; | > > > > > > > > > > > > > > > > > > > > > < | < | < > > > | | | < | > | > > > > > > > | > | | | > < | < < < | 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 | /* * Probably we should provide an equivalent to the C API for TCP. * * Tcl_Channel Tcl_OpenUdpClient(interp, port, host, myaddr, myport, async); * Tcl_Channel Tcl_OpenUdpServer(interp, port, myaddr, proc, clientData); * Tcl_Channel Tcl_MakeUdpClientChannel(sock); */ /* * ---------------------------------------------------------------------- * checkOption -- * * Checks if the specified option is part of the specified command line options. * Returns 1 if option is present, otherwise 0. * ---------------------------------------------------------------------- */ static int hasOption(int argc, CONST84 char * argv[],const char* option ) { int i; for (i=0;i<argc;i++) { if (strcmp(option, argv[i])==0) { /* Option found. */ return 1; } } return 0; } /* * ---------------------------------------------------------------------- * udpOpen -- * * opens a UDP socket and addds the file descriptor to the tcl * interpreter * ---------------------------------------------------------------------- */ int udpOpen(ClientData clientData, Tcl_Interp *interp, int argc, CONST84 char * argv[]) { int sock; char channelName[20]; UdpState *statePtr; uint16_t localport = 0; int reuse = 0; struct sockaddr_storage addr,sockaddr; socklen_t addr_len; unsigned long status = 1; socklen_t len; short ss_family = AF_INET; /* Default ipv4 */ char errmsg[] = "upd_open [remoteport] [ipv6] [reuse]"; int remaining_options = argc; if (argc >= 2) { if (hasOption(argc,argv,"reuse")) { reuse = 1; remaining_options--; } if (hasOption(argc,argv,"ipv6")) { ss_family = AF_INET6; remaining_options--; } /* The remaining option must be the port (if specified) */ if (remaining_options == 2) { if (udpGetService(interp, argv[1], &localport) != TCL_OK) { Tcl_SetResult (interp, errmsg, NULL); return TCL_ERROR; } } } memset(channelName, 0, sizeof(channelName)); sock = socket(ss_family, SOCK_DGRAM, 0); if (sock < 0) { snprintf(errBuf, 255, "failed to create socket"); errBuf[255] = 0; UDPTRACE("%s\n", errBuf); Tcl_AppendResult(interp, errBuf, (char *)NULL); return TCL_ERROR; } |
︙ | ︙ | |||
281 282 283 284 285 286 287 | if (SetHandleInformation((HANDLE)sock, HANDLE_FLAG_INHERIT, 0) == 0) { Tcl_AppendResult(interp, "failed to set close-on-exec bit", NULL); return TCL_ERROR; } #endif /* WIN32 */ #endif /* HAVE_FLAG_FD_CLOEXEC */ | < < < < < < < < < > > > > > | > > > > > > > > > > > | > | | | | | < > > | 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 | if (SetHandleInformation((HANDLE)sock, HANDLE_FLAG_INHERIT, 0) == 0) { Tcl_AppendResult(interp, "failed to set close-on-exec bit", NULL); return TCL_ERROR; } #endif /* WIN32 */ #endif /* HAVE_FLAG_FD_CLOEXEC */ if (reuse) { int one = 1; #ifdef SO_REUSEPORT if (setsockopt(sock, SOL_SOCKET, SO_REUSEPORT, (const char *)&one, sizeof(one)) < 0) { #else if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (const char *)&one, sizeof(one)) < 0) { #endif Tcl_SetObjResult(interp, ErrorToObj("error setting socket option")); closesocket(sock); return TCL_ERROR; } } memset(&addr, 0, sizeof(addr)); if (ss_family == AF_INET6) { ((struct sockaddr_in6 *) &addr)->sin6_family = AF_INET6; ((struct sockaddr_in6 *) &addr)->sin6_port = localport; addr_len = sizeof(struct sockaddr_in6); } else { ((struct sockaddr_in *) &addr)->sin_family = AF_INET; ((struct sockaddr_in *) &addr)->sin_port = localport; addr_len = sizeof(struct sockaddr_in); } if ( bind(sock,(struct sockaddr *)&addr, addr_len) < 0) { Tcl_SetObjResult(interp, ErrorToObj("failed to bind socket to port")); closesocket(sock); return TCL_ERROR; } ioctlsocket(sock, FIONBIO, &status); if (localport == 0) { len = sizeof(sockaddr); getsockname(sock, (struct sockaddr *)&sockaddr, &len); if (ss_family == AF_INET6) { localport = ((struct sockaddr_in6 *) &sockaddr)->sin6_port; } else { localport = ((struct sockaddr_in *) &sockaddr)->sin_port; } } UDPTRACE("Open socket %d. Bind socket to port %d\n", sock, ntohs(localport)); statePtr = (UdpState *) ckalloc((unsigned) sizeof(UdpState)); memset(statePtr, 0, sizeof(UdpState)); statePtr->sock = sock; sprintf(channelName, "sock%d", statePtr->sock); statePtr->channel = Tcl_CreateChannel(&Udp_ChannelType, channelName, (ClientData) statePtr, (TCL_READABLE | TCL_WRITABLE | TCL_MODE_NONBLOCKING)); statePtr->doread = 1; statePtr->multicast = 0; statePtr->groupsObj = Tcl_NewListObj(0, NULL); Tcl_IncrRefCount(statePtr->groupsObj); statePtr->localport = localport; statePtr->ss_family = ss_family; Tcl_RegisterChannel(interp, statePtr->channel); #ifdef WIN32 statePtr->threadId = Tcl_GetCurrentThread(); statePtr->packetNum = 0; statePtr->next = NULL; statePtr->packets = NULL; statePtr->packetsTail = NULL; |
︙ | ︙ | |||
357 358 359 360 361 362 363 | SetEvent(sockListLock); SetEvent(waitForSock); #endif return TCL_OK; } /* | | | | | | | > | < < < | | | | > > > > > | | | | < < < | | < < | < | < < < < < < < < < < | < < < < < < | < < | | | | | | | < < | < | | | < | | | | < < | | | < | < < < < < < < < | | < > | < | | < < < < < < | | < > > | | | < | > | | | | | < < | > | 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 | SetEvent(sockListLock); SetEvent(waitForSock); #endif return TCL_OK; } /* * ---------------------------------------------------------------------- * udpConf -- * ---------------------------------------------------------------------- */ int udpConf(ClientData clientData, Tcl_Interp *interp, int argc, CONST84 char * argv[]) { Tcl_Channel chan; char remoteOptions[255]; UdpState *statePtr = NULL; int r = TCL_ERROR; Tcl_DString ds; char errmsg[] = "udp_conf fileId [-mcastadd] [-mcastdrop] groupaddr | " #ifdef WIN32 "udp_conf fileId [-mcastadd] [-mcastdrop] \"groupaddr netwif_index\" | " #else "udp_conf fileId [-mcastadd] [-mcastdrop] \"groupaddr netwif\" | " #endif "udp_conf fileId remotehost remoteport | " "udp_conf fileId [-myport] [-remote] [-peer] [-mcastgroups] [-mcastloop] [-broadcast] [-ttl]"; if (argc >= 2) { chan = Tcl_GetChannel(interp, (char *)argv[1], NULL); if (chan != (Tcl_Channel) NULL) { statePtr = (UdpState *) Tcl_GetChannelInstanceData(chan); } } if (argc == 3 && statePtr != NULL) { Tcl_DStringInit(&ds); r = Tcl_GetChannelOption(interp, statePtr->channel, argv[2], &ds); if (r == TCL_OK) { Tcl_DStringResult(interp, &ds); } Tcl_DStringFree(&ds); } if (argc == 4 && statePtr != NULL) { if (hasOption(argc,argv,"-mcastloop") || hasOption(argc,argv,"-broadcast") || hasOption(argc,argv,"-mcastadd") || hasOption(argc,argv,"-mcastdrop") || hasOption(argc,argv,"-ttl")) { r = Tcl_SetChannelOption(interp, statePtr->channel, argv[2], argv[3]); } else { sprintf(remoteOptions, "%s %s",argv[2],argv[3] ); r = Tcl_SetChannelOption(interp, statePtr->channel, "-remote", remoteOptions); } } if (r != TCL_OK) { Tcl_SetResult (interp, errmsg, NULL); } return r; } /* * ---------------------------------------------------------------------- * udpPeek -- * peek some data and set the peer information * ---------------------------------------------------------------------- */ int udpPeek(ClientData clientData, Tcl_Interp *interp, int argc, CONST84 char * argv[]) { #ifndef WIN32 int buffer_size = 16; int actual_size; socklen_t socksize; char message[17]; struct sockaddr_storage recvaddr; Tcl_Channel chan; UdpState *statePtr; if (argc < 2) { Tcl_WrongNumArgs(interp, 0, NULL, "udp_peek sock ?buffersize?"); return TCL_ERROR; } chan = Tcl_GetChannel(interp, (char *)argv[1], NULL); if (chan == (Tcl_Channel) NULL) { return TCL_ERROR; } statePtr = (UdpState *) Tcl_GetChannelInstanceData(chan); if (argc > 2) { buffer_size = atoi(argv[2]); if (buffer_size > 16) buffer_size = 16; } memset(message, 0 , sizeof(message)); actual_size = recvfrom(statePtr->sock, message, buffer_size, MSG_PEEK, (struct sockaddr *)&recvaddr, &socksize); if (actual_size < 0 && errno != EAGAIN && errno != EWOULDBLOCK) { Tcl_SetObjResult(interp, ErrorToObj("udppeek error")); return TCL_ERROR; } if (statePtr->ss_family == AF_INET6) { inet_ntop(AF_INET6, &((struct sockaddr_in6*)&recvaddr)->sin6_addr, statePtr->peerhost, sizeof(statePtr->peerhost) ); statePtr->peerport = ntohs(((struct sockaddr_in6*)&recvaddr)->sin6_port); } else { inet_ntop(AF_INET, &((struct sockaddr_in*)&recvaddr)->sin_addr, statePtr->peerhost, sizeof(statePtr->peerhost) ); statePtr->peerport = ntohs(((struct sockaddr_in*)&recvaddr)->sin_port); } Tcl_AppendResult(interp, message, (char *)NULL); return TCL_OK; #else /* WIN32 */ Tcl_SetResult(interp, "udp_peek not implemented for this platform", TCL_STATIC); return TCL_ERROR; #endif /* ! WIN32 */ |
︙ | ︙ | |||
583 584 585 586 587 588 589 | { UdpState *statePtr; UdpEvent *evPtr; int actual_size; socklen_t socksize; int buffer_size = MAXBUFFERSIZE; char *message; | > > | | | < | | > > | < | < < < < < | | > > > > > | > > > > > > > > | < > | < < < | | > | > > | | | > > | > | | > > | 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 | { UdpState *statePtr; UdpEvent *evPtr; int actual_size; socklen_t socksize; int buffer_size = MAXBUFFERSIZE; char *message; struct sockaddr_storage recvaddr; PacketList *p; #ifdef WIN32 char hostaddr[256]; char* portaddr; char remoteaddr[256]; int remoteaddrlen = sizeof(remoteaddr); memset(hostaddr, 0 , sizeof(hostaddr)); memset(remoteaddr,0,sizeof(remoteaddr)); #endif /* WIN32 */ /* UDPTRACE("checkProc\n"); */ /* synchronized */ WaitForSingleObject(sockListLock, INFINITE); for (statePtr = sockList; statePtr != NULL; statePtr=statePtr->next) { if (statePtr->packetNum > 0) { UDPTRACE("UDP_CheckProc\n"); /* Read the data from socket and put it into statePtr */ socksize = sizeof(recvaddr); memset(&recvaddr, 0, socksize); message = (char *)ckalloc(MAXBUFFERSIZE); if (message == NULL) { UDPTRACE("ckalloc error\n"); exit(1); } memset(message, 0, MAXBUFFERSIZE); actual_size = recvfrom(statePtr->sock, message, buffer_size, 0, (struct sockaddr *)&recvaddr, &socksize); SetEvent(waitSockRead); if (actual_size < 0) { UDPTRACE("UDP error - recvfrom %d\n", statePtr->sock); ckfree(message); } else { p = (PacketList *)ckalloc(sizeof(struct PacketList)); p->message = message; p->actual_size = actual_size; #ifdef WIN32 /* * In windows, do not use getnameinfo() since this function does * not work correctly in case of multithreaded. Also inet_ntop() is * not available in older windows versions. */ if (WSAAddressToString((struct sockaddr *)&recvaddr,socksize, NULL,remoteaddr,&remoteaddrlen)==0) { /* * We now have an address in the format of <ip address>:<port> * Search backwards for the last ':' */ portaddr = strrchr(remoteaddr,':') + 1; strncpy(hostaddr,remoteaddr,strlen(remoteaddr)-strlen(portaddr)-1); statePtr->peerport = atoi(portaddr); p->r_port = statePtr->peerport; strcpy(statePtr->peerhost,hostaddr); strcpy(p->r_host,hostaddr); } #else if (statePtr->ss_family == AF_INET ) { inet_ntop(AF_INET, ((struct sockaddr_in*)&recvaddr)->sin_addr, statePtr->peerhost, sizeof(statePtr->peerhost) ); inet_ntop(AF_INET, ((struct sockaddr_in*)&recvaddr)->sin_addr, p->r_host, sizeof(p->r_host) ); p->r_port = ntohs(((struct sockaddr_in*)&recvaddr)->sin_port); statePtr->peerport = ntohs(((struct sockaddr_in*)&recvaddr)->sin_port); } else { inet_ntop(AF_INET6, ((struct sockaddr_in6*)&recvaddr)->sin6_addr, statePtr->peerhost, sizeof(statePtr->peerhost) ); inet_ntop(AF_INET6, ((struct sockaddr_in6*)&recvaddr)->sin6_addr, p->r_host, sizeof(p->r_host) ); p->r_port = ntohs(((struct sockaddr_in6*)&recvaddr)->sin6_port); statePtr->peerport = ntohs(((struct sockaddr_in6*)&recvaddr)->sin6_port); } #endif /* WIN32 */ p->next = NULL; if (statePtr->packets == NULL) { statePtr->packets = p; statePtr->packetsTail = p; } else { statePtr->packetsTail->next = p; statePtr->packetsTail = p; } |
︙ | ︙ | |||
753 754 755 756 757 758 759 | WaitForSingleObject(sockListLock, INFINITE); sockset = 0; for (statePtr = sockList; statePtr != NULL; statePtr=statePtr->next) { if (FD_ISSET(statePtr->sock, &readfds)) { statePtr->packetNum++; sockset++; | | | 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 | WaitForSingleObject(sockListLock, INFINITE); sockset = 0; for (statePtr = sockList; statePtr != NULL; statePtr=statePtr->next) { if (FD_ISSET(statePtr->sock, &readfds)) { statePtr->packetNum++; sockset++; UDPTRACE("sock %d is set\n", statePtr->sock); break; } } SetEvent(sockListLock); /* wait for the socket data was read */ if (sockset > 0) { |
︙ | ︙ | |||
868 869 870 871 872 873 874 | #ifdef WIN32 UdpState *tmp, *p; WaitForSingleObject(sockListLock, INFINITE); #endif /* ! WIN32 */ sock = statePtr->sock; | | | | | | | | | | | | | | | | | | | > | | > > > | > | | | | | | | | 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 | #ifdef WIN32 UdpState *tmp, *p; WaitForSingleObject(sockListLock, INFINITE); #endif /* ! WIN32 */ sock = statePtr->sock; #ifdef WIN32 /* remove the statePtr from the list */ for (tmp = p = sockList; p != NULL; tmp = p, p = p->next) { if (p->sock == sock) { UDPTRACE("Remove %d from the list\n", p->sock); if (p == sockList) { sockList = sockList->next; } else { tmp->next = p->next; } } } #endif /* ! WIN32 */ /* * If there are multicast groups added they should be dropped. */ if (statePtr->groupsObj) { int n = 0; Tcl_Obj *dupGroupList = Tcl_DuplicateObj(statePtr->groupsObj); Tcl_IncrRefCount(dupGroupList); Tcl_ListObjGetElements(interp, dupGroupList, &objc, &objv); for (n = 0; n < objc; n++) { if (statePtr->ss_family==AF_INET) { UdpMulticast(statePtr, interp, Tcl_GetString(objv[n]), IP_DROP_MEMBERSHIP); } else { UdpMulticast(statePtr, interp, Tcl_GetString(objv[n]), IPV6_LEAVE_GROUP); } } Tcl_DecrRefCount(dupGroupList); Tcl_DecrRefCount(statePtr->groupsObj); } /* No - doing this causes a infinite recursion. Let Tcl handle this. * Tcl_UnregisterChannel(interp, statePtr->channel); */ if (closesocket(sock) < 0) { errorCode = errno; } ckfree((char *) statePtr); if (errorCode != 0) { #ifndef WIN32 sprintf(errBuf, "udp_close: %d, error: %d\n", sock, errorCode); #else sprintf(errBuf, "udp_cose: %d, error: %d\n", sock, WSAGetLastError()); #endif UDPTRACE("UDP error - close %d", sock); } else { UDPTRACE("Close socket %d\n", sock); } #ifdef WIN32 SetEvent(sockListLock); #endif return errorCode; } /* * ---------------------------------------------------------------------- * udpWatch -- * ---------------------------------------------------------------------- */ static void udpWatch(ClientData instanceData, int mask) |
︙ | ︙ | |||
977 978 979 980 981 982 983 | * ---------------------------------------------------------------------- * udpOutput-- * ---------------------------------------------------------------------- */ static int udpOutput(ClientData instanceData, CONST84 char *buf, int toWrite, int *errorCode) { | | < | < < | < | < < | > > | | > > > > | < | > > > > > | > | | > | > > | > | < | | | | < | | < < < < | | | | | > | | | | | | | | | < < < < < < < | < | 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 | * ---------------------------------------------------------------------- * udpOutput-- * ---------------------------------------------------------------------- */ static int udpOutput(ClientData instanceData, CONST84 char *buf, int toWrite, int *errorCode) { UdpState *statePtr = (UdpState *) instanceData; int written; int socksize; struct hostent *name; struct sockaddr_in sendaddrv4; struct sockaddr_in6 sendaddrv6; struct addrinfo hints, *result; if (toWrite > MAXBUFFERSIZE) { UDPTRACE("UDP error - MAXBUFFERSIZE"); return -1; } if (statePtr->ss_family == AF_INET6) { socksize = sizeof(sendaddrv6); memset(&sendaddrv6, 0, socksize); memset(&hints, 0, sizeof(struct addrinfo)); hints.ai_family = AF_INET6; hints.ai_socktype = SOCK_DGRAM; hints.ai_protocol = IPPROTO_UDP; if (getaddrinfo(statePtr->remotehost, NULL, &hints, &result) != 0) { UDPTRACE("UDP error - getaddrinfo failed"); return -1; } memcpy (&sendaddrv6, result->ai_addr, result->ai_addrlen); freeaddrinfo(result); sendaddrv6.sin6_family = AF_INET6; sendaddrv6.sin6_port = statePtr->remoteport; written = sendto(statePtr->sock, buf, toWrite, 0, (struct sockaddr *)&sendaddrv6, socksize); } else { socksize = sizeof(sendaddrv4); memset(&sendaddrv4, 0, socksize); sendaddrv4.sin_addr.s_addr = inet_addr(statePtr->remotehost); if (sendaddrv4.sin_addr.s_addr == -1) { name = gethostbyname(statePtr->remotehost); if (name == NULL) { UDPTRACE("UDP error - gethostbyname"); return -1; } memcpy(&sendaddrv4.sin_addr, name->h_addr, sizeof(sendaddrv4.sin_addr)); } sendaddrv4.sin_family = AF_INET; sendaddrv4.sin_port = statePtr->remoteport; written = sendto(statePtr->sock, buf, toWrite, 0, (struct sockaddr *)&sendaddrv4, socksize); } if (written < 0) { UDPTRACE("UDP error - sendto"); return -1; } UDPTRACE("Send %d to %s:%d through %d\n", written, statePtr->remotehost, ntohs(statePtr->remoteport), statePtr->sock); return written; } /* * ---------------------------------------------------------------------- * udpInput * ---------------------------------------------------------------------- */ static int udpInput(ClientData instanceData, char *buf, int bufSize, int *errorCode) { UdpState *statePtr = (UdpState *) instanceData; int bytesRead; #ifdef WIN32 PacketList *packets; #else /* ! WIN32 */ socklen_t socksize; int buffer_size = MAXBUFFERSIZE; int sock = statePtr->sock; struct sockaddr_storage recvaddr; #endif /* ! WIN32 */ UDPTRACE("In udpInput\n"); /* * The caller of this function is looking for a stream oriented * system, so it keeps calling the function until no bytes are |
︙ | ︙ | |||
1107 1108 1109 1110 1111 1112 1113 | strcpy(statePtr->peerhost, packets->r_host); statePtr->peerport = packets->r_port; statePtr->packets = packets->next; ckfree((char *) packets); bytesRead = bufSize; #else /* ! WIN32 */ socksize = sizeof(recvaddr); | < < < < < | < < | | | | | | < < | > | < | 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 | strcpy(statePtr->peerhost, packets->r_host); statePtr->peerport = packets->r_port; statePtr->packets = packets->next; ckfree((char *) packets); bytesRead = bufSize; #else /* ! WIN32 */ socksize = sizeof(recvaddr); memset(&recvaddr, 0, socksize); bytesRead = recvfrom(sock, buf, buffer_size, 0, (struct sockaddr *)&recvaddr, &socksize); if (bytesRead < 0) { UDPTRACE("UDP error - recvfrom %d\n", sock); *errorCode = errno; return -1; } if (statePtr->ss_family == AF_INET6) { inet_ntop(AF_INET6, &((struct sockaddr_in6*)&recvaddr)->sin6_addr, statePtr->peerhost, sizeof(statePtr->peerhost) ); statePtr->peerport = ntohs(((struct sockaddr_in6*)&recvaddr)->sin6_port); } else { inet_ntop(AF_INET, &((struct sockaddr_in*)&recvaddr)->sin_addr, statePtr->peerhost, sizeof(statePtr->peerhost) ); statePtr->peerport = ntohs(((struct sockaddr_in*)&recvaddr)->sin_port); } UDPTRACE("remotehost: %s:%d\n", statePtr->peerhost, statePtr->peerport); #endif /* ! WIN32 */ /* we don't want to return anything next time */ if (bytesRead > 0) { buf[bytesRead] = '\0'; statePtr->doread = 0; } |
︙ | ︙ | |||
1179 1180 1181 1182 1183 1184 1185 | } /* * ---------------------------------------------------------------------- * * UdpMulticast -- * | | > | > > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | | | | | | | | | | | | | | < | > > > | > > > > > > > > > | > > > > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > | | | | | | > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > | | > | | | | > | | | | | | | | | | | < | < | < < | < | | | < | < | < | < < | < | | | < | | | < < | < < < < | < | | | < | | | | | | | | | | | | | | | | | | | | < < < < < < < < < < < < < < < < < < < < < < < < < | < < < | < | < < < < < < < < < < < | | < < < < < < < < < < < < < | | < < < < < < < < < < | < < < < < < | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 | } /* * ---------------------------------------------------------------------- * * UdpMulticast -- * * Action should be IP_ADD_MEMBERSHIP | IPV6_JOIN_GROUP * or IP_DROP_MEMBERSHIP | IPV6_LEAVE_GROUP * */ static int UdpMulticast(UdpState *statePtr, Tcl_Interp *interp, const char *grp, int action) { int r; Tcl_Obj *tcllist , *multicastgrp , *nw_interface; int len,result; int nwinterface_index =-1; #ifndef WIN32 struct ifreq ifreq; #endif /* ! WIN32 */ /* * Parameter 'grp' can be: * Windows: <multicast group> or {<multicast group> <network interface index>} * Not Windows: <multicast group> or {<multicast group> <network interface name>} */ tcllist = Tcl_NewStringObj(grp, -1); result = Tcl_ListObjLength(interp, tcllist, &len); if (result == TCL_OK) { if (len==2) { Tcl_ListObjIndex(interp, tcllist, 0, &multicastgrp); Tcl_ListObjIndex(interp, tcllist, 1, &nw_interface); #ifdef WIN32 if ( Tcl_GetIntFromObj(interp,nw_interface,&nwinterface_index) == TCL_ERROR && nwinterface_index < 1) { Tcl_SetResult(interp, "not a valid network interface index; should start with 1", TCL_STATIC); return TCL_ERROR; } #else int lenPtr = -1; if (nw_interface->length > IFNAMSIZ ) { Tcl_SetResult(interp, "unknown network interface", TCL_STATIC); return TCL_ERROR; } if (statePtr->ss_family == AF_INET) { /* For IPv4, we need the network interface address. */ strcpy(ifreq.ifr_name,Tcl_GetStringFromObj(nw_interface,&lenPtr)); if (ioctl(statePtr->sock, SIOCGIFADDR, &ifreq) < 0 ) { Tcl_SetResult(interp, "unknown network interface", TCL_STATIC); return TCL_ERROR; } } nwinterface_index = if_nametoindex(Tcl_GetStringFromObj(nw_interface,&lenPtr)); if (nwinterface_index == 0 ) { Tcl_SetResult(interp, "unknown network interface", TCL_STATIC); return TCL_ERROR; } #endif /* ! WIN32 */ } else if (len==1) { Tcl_ListObjIndex(interp, tcllist, 0, &multicastgrp); } else { Tcl_SetResult(interp, "multicast group and/or local network interface not specified", TCL_STATIC); return TCL_ERROR; } } if (statePtr->ss_family == AF_INET) { struct ip_mreq mreq; struct hostent *name; memset(&mreq, 0, sizeof(mreq)); mreq.imr_multiaddr.s_addr = inet_addr(Tcl_GetString(multicastgrp)); if (mreq.imr_multiaddr.s_addr == -1) { name = gethostbyname(Tcl_GetString(multicastgrp)); if (name == NULL) { if (interp != NULL) { Tcl_SetResult(interp, "invalid group name", TCL_STATIC); } return TCL_ERROR; } memcpy(&mreq.imr_multiaddr.s_addr, name->h_addr, sizeof(mreq.imr_multiaddr)); } if (nwinterface_index==-1) { /* No interface index specified. Let the system use the default interface. */ mreq.imr_interface.s_addr = INADDR_ANY; } else { #ifdef WIN32 /* Using an interface index of x is indicated by 0.0.0.x */ mreq.imr_interface.s_addr = htonl(nwinterface_index); #else memcpy(&mreq.imr_interface, &((struct sockaddr_in *) &ifreq.ifr_addr)->sin_addr, sizeof(struct in_addr)); #endif } if (setsockopt(statePtr->sock, IPPROTO_IP, action, (const char*)&mreq, sizeof(mreq)) < 0) { if (interp != NULL) { Tcl_SetObjResult(interp, ErrorToObj("error changing multicast group")); } return TCL_ERROR; } } else { struct ipv6_mreq mreq6; struct addrinfo hints; struct addrinfo *result = NULL; memset(&hints, 0, sizeof(hints)); hints.ai_family = statePtr->ss_family; hints.ai_socktype = SOCK_DGRAM; hints.ai_protocol = IPPROTO_UDP; r = getaddrinfo(Tcl_GetString(multicastgrp), NULL, &hints, &result); memcpy(&mreq6.ipv6mr_multiaddr, &((struct sockaddr_in6*)(result->ai_addr))->sin6_addr,sizeof(mreq6.ipv6mr_multiaddr)); freeaddrinfo(result); if (r != 0 ) { Tcl_SetResult(interp, "invalid group name", TCL_STATIC); return TCL_ERROR; } if (nwinterface_index == -1) { /* Let the system choose the default multicast network interface. */ mreq6.ipv6mr_interface = 0; } else { /* Use the specified network interface. */ mreq6.ipv6mr_interface = nwinterface_index; } if (setsockopt(statePtr->sock, IPPROTO_IPV6, action, (const char*)&mreq6, sizeof(mreq6)) < 0) { if (interp != NULL) { Tcl_SetObjResult(interp, ErrorToObj("error changing multicast group")); } return TCL_ERROR; } } if (action == IP_ADD_MEMBERSHIP || action == IPV6_JOIN_GROUP) { int ndx = LSearch(statePtr->groupsObj, grp); if (ndx == -1) { Tcl_Obj *newPtr; statePtr->multicast++; if (Tcl_IsShared(statePtr->groupsObj)) { newPtr = Tcl_DuplicateObj(statePtr->groupsObj); Tcl_DecrRefCount(statePtr->groupsObj); Tcl_IncrRefCount(newPtr); statePtr->groupsObj = newPtr; } Tcl_ListObjAppendElement(interp, statePtr->groupsObj, Tcl_NewStringObj(grp,-1)); } } else { int ndx = LSearch(statePtr->groupsObj, grp); if (ndx != -1) { Tcl_Obj *old, *ptr; int dup = 0; old = ptr = statePtr->groupsObj; statePtr->multicast--; if ((dup = Tcl_IsShared(ptr))) { ptr = Tcl_DuplicateObj(ptr); } Tcl_ListObjReplace(interp, ptr, ndx, 1, 0, NULL); if (dup) { statePtr->groupsObj = ptr; Tcl_IncrRefCount(ptr); Tcl_DecrRefCount(old); } } } if (interp != NULL) Tcl_SetObjResult(interp, statePtr->groupsObj); return TCL_OK; } /* * ---------------------------------------------------------------------- * udpGetOption -- * ---------------------------------------------------------------------- */ static int udpGetOption(ClientData instanceData, Tcl_Interp *interp, CONST84 char *optionName, Tcl_DString *optionValue) { UdpState *statePtr = (UdpState *)instanceData; CONST84 char * options[] = { "myport", "remote", "peer", "mcastgroups", "mcastloop", "broadcast", "ttl", NULL}; int r = TCL_OK; if (optionName == NULL) { Tcl_DString ds; const char **p; Tcl_DStringInit(&ds); for (p = options; *p != NULL; p++) { char op[16]; sprintf(op, "-%s", *p); Tcl_DStringSetLength(&ds, 0); udpGetOption(instanceData, interp, op, &ds); Tcl_DStringAppend(optionValue, " ", 1); Tcl_DStringAppend(optionValue, op, -1); Tcl_DStringAppend(optionValue, " ", 1); Tcl_DStringAppendElement(optionValue, Tcl_DStringValue(&ds)); } } else { Tcl_DString ds, dsInt; Tcl_DStringInit(&ds); Tcl_DStringInit(&dsInt); if (!strcmp("-myport", optionName)) { Tcl_DStringSetLength(&ds, TCL_INTEGER_SPACE); sprintf(Tcl_DStringValue(&ds), "%u", ntohs(statePtr->localport)); } else if (!strcmp("-remote", optionName)) { if (statePtr->remotehost && *statePtr->remotehost) { Tcl_DStringSetLength(&dsInt, TCL_INTEGER_SPACE); sprintf(Tcl_DStringValue(&dsInt), "%u", ntohs(statePtr->remoteport)); Tcl_DStringAppendElement(&ds, statePtr->remotehost); Tcl_DStringAppendElement(&ds, Tcl_DStringValue(&dsInt)); } } else if (!strcmp("-peer", optionName)) { if (statePtr->peerhost && *statePtr->peerhost) { Tcl_DStringSetLength(&dsInt, TCL_INTEGER_SPACE); sprintf(Tcl_DStringValue(&dsInt), "%u", statePtr->peerport); Tcl_DStringAppendElement(&ds, statePtr->peerhost); Tcl_DStringAppendElement(&ds, Tcl_DStringValue(&dsInt)); } } else if (!strcmp("-mcastgroups", optionName)) { int objc, n; Tcl_Obj **objv; Tcl_ListObjGetElements(interp, statePtr->groupsObj, &objc, &objv); for (n = 0; n < objc; n++) { Tcl_DStringAppendElement(&ds, Tcl_GetString(objv[n])); } } else if (!strcmp("-broadcast", optionName)) { int tmp =1; r = udpGetBroadcastOption(statePtr,interp,&tmp); if (r==TCL_OK) { Tcl_DStringSetLength(&ds, TCL_INTEGER_SPACE); sprintf(Tcl_DStringValue(&ds), "%d", tmp); } } else if (!strcmp("-mcastloop", optionName)) { unsigned char tmp = 0; r = udpGetMcastloopOption(statePtr, interp,&tmp); if (r==TCL_OK) { Tcl_DStringSetLength(&ds, TCL_INTEGER_SPACE); sprintf(Tcl_DStringValue(&ds), "%d", (int)tmp); } } else if (!strcmp("-ttl", optionName)) { unsigned int tmp = 0; r = udpGetTtlOption(statePtr,interp,&tmp); if (r==TCL_OK) { Tcl_DStringSetLength(&ds, TCL_INTEGER_SPACE); sprintf(Tcl_DStringValue(&ds), "%u", tmp); } } else { CONST84 char **p; Tcl_DString tmp; Tcl_DStringInit(&tmp); for (p = options; *p != NULL; p++) Tcl_DStringAppendElement(&tmp, *p); r = Tcl_BadChannelOption(interp, optionName, Tcl_DStringValue(&tmp)); Tcl_DStringFree(&tmp); } if (r == TCL_OK) { Tcl_DStringAppend(optionValue, Tcl_DStringValue(&ds), -1); } Tcl_DStringFree(&dsInt); Tcl_DStringFree(&ds); } return r; } /* * ---------------------------------------------------------------------- * udpSetOption -- * * Handle channel configuration requests from the generic layer. * * ---------------------------------------------------------------------- */ static int udpSetOption(ClientData instanceData, Tcl_Interp *interp, CONST84 char *optionName, CONST84 char *newValue) { UdpState *statePtr = (UdpState *)instanceData; CONST84 char * options = "remote mcastadd mcastdrop mcastloop broadcast ttl"; int r = TCL_OK; if (!strcmp("-remote", optionName)) { r = udpSetRemoteOption(statePtr,interp,(const char *)newValue); } else if (!strcmp("-mcastadd", optionName)) { r = udpSetMulticastAddOption(statePtr, interp, (const char *)newValue); } else if (!strcmp("-mcastdrop", optionName)) { r = udpSetMulticastDropOption(statePtr, interp, (const char *)newValue); } else if (!strcmp("-broadcast", optionName)) { r = udpSetBroadcastOption(statePtr, interp, (const char*) newValue); } else if (!strcmp("-mcastloop", optionName)) { r = udpSetMcastloopOption(statePtr, interp, (const char*) newValue); } else if (!strcmp("-ttl", optionName)) { r = udpSetTtlOption(statePtr, interp, (const char*) newValue); } else { Tcl_BadChannelOption(interp, optionName, options); r=TCL_ERROR; } return r; } /* * ---------------------------------------------------------------------- * udpGetTtlOption -- * * Handle ttl configuration requests. * * ---------------------------------------------------------------------- */ static int udpGetTtlOption(UdpState *statePtr, Tcl_Interp *interp,unsigned int *value) { int result = TCL_ERROR; int cmd; socklen_t optlen = sizeof(unsigned int); if (statePtr->ss_family==AF_INET) { if (statePtr->multicast > 0) { cmd = IP_MULTICAST_TTL; } else { cmd = IP_TTL; } result = getsockopt(statePtr->sock, IPPROTO_IP, cmd, (char*)value, &optlen); } else { if (statePtr->multicast > 0) { cmd = IPV6_MULTICAST_HOPS; } else { cmd = IPV6_UNICAST_HOPS; } result = getsockopt(statePtr->sock, IPPROTO_IPV6, cmd, (char*)value, &optlen); } if (result==TCL_ERROR) { Tcl_SetObjResult(interp, Tcl_NewStringObj("error getting -ttl",-1)); } return result; } /* * ---------------------------------------------------------------------- * udpSetTtlOption -- * * Handle ttl configuration requests. * * ---------------------------------------------------------------------- */ static int udpSetTtlOption(UdpState *statePtr, Tcl_Interp *interp,CONST84 char *newValue) { int result = TCL_ERROR; int tmp = 0; int cmd; result = Tcl_GetInt(interp, newValue, &tmp); if (statePtr->ss_family==AF_INET) { if (statePtr->multicast > 0) { cmd = IP_MULTICAST_TTL; } else { cmd = IP_TTL; } if (result == TCL_OK) { result = setsockopt(statePtr->sock, IPPROTO_IP, cmd,(const char *)&tmp, sizeof(unsigned int)); } } else { if (statePtr->multicast > 0) { cmd = IPV6_MULTICAST_HOPS; } else { cmd = IPV6_UNICAST_HOPS; } if (result == TCL_OK) { result = setsockopt(statePtr->sock, IPPROTO_IPV6, cmd,(const char *)&tmp, sizeof(unsigned int)); } } if (result==TCL_ERROR) { Tcl_SetObjResult(interp, Tcl_NewStringObj("error setting -ttl",-1)); } else { Tcl_SetObjResult(interp, Tcl_NewIntObj(tmp)); } return result; } /* * ---------------------------------------------------------------------- * udpGetMcastloopOption -- * * Handle multicast loop configuration requests. * * ---------------------------------------------------------------------- */ static int udpGetMcastloopOption(UdpState *statePtr, Tcl_Interp *interp, unsigned char * value) { int result = TCL_ERROR; socklen_t optlen=sizeof(int); if (statePtr->ss_family == AF_INET) { result = getsockopt(statePtr->sock, IPPROTO_IP, IP_MULTICAST_LOOP,value, &optlen); } else { result = getsockopt(statePtr->sock, IPPROTO_IPV6, IPV6_MULTICAST_LOOP,value, &optlen); } if (result == TCL_ERROR) { Tcl_SetObjResult(interp, Tcl_NewStringObj("error getting -mcastloop",-1)); } return result; } /* * ---------------------------------------------------------------------- * udpSetMcastloopOption -- * * Handle multicast loop configuration requests. * * ---------------------------------------------------------------------- */ static int udpSetMcastloopOption(UdpState *statePtr, Tcl_Interp *interp,CONST84 char *newValue) { int result = TCL_ERROR; int tmp = 1; if (Tcl_GetBoolean(interp, newValue, &tmp)==TCL_OK) { if (statePtr->ss_family == AF_INET) { result = setsockopt(statePtr->sock, IPPROTO_IP, IP_MULTICAST_LOOP, (const char *)&tmp, sizeof(tmp)); } else { result = setsockopt(statePtr->sock, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, (const char *)&tmp, sizeof(tmp)); } } if (result == TCL_ERROR) { Tcl_SetObjResult(interp, Tcl_NewStringObj("error setting -mcastloop",-1)); } else { Tcl_SetObjResult(interp, Tcl_NewIntObj(tmp)); } return result; } /* * ---------------------------------------------------------------------- * udpGetBroadcastOption -- * * Handle broadcast configuration requests. * * ---------------------------------------------------------------------- */ static int udpGetBroadcastOption(UdpState *statePtr, Tcl_Interp *interp, int* value) { int result = TCL_OK; socklen_t optlen = sizeof(int); if (statePtr->ss_family == AF_INET6 ) { Tcl_SetObjResult(interp, Tcl_NewStringObj("broadcast not supported under ipv6",-1)); return TCL_ERROR; } if (getsockopt(statePtr->sock, SOL_SOCKET, SO_BROADCAST, (char*)value, &optlen)) { Tcl_SetObjResult(interp, Tcl_NewStringObj("error getting -broadcast",-1)); result = TCL_ERROR; } return result; } /* * ---------------------------------------------------------------------- * udpSetBroadcastOption -- * * Handle broadcast configuration requests. * * ---------------------------------------------------------------------- */ static int udpSetBroadcastOption(UdpState *statePtr, Tcl_Interp *interp,CONST84 char *newValue) { int result; int tmp = 1; if (statePtr->ss_family == AF_INET6 ) { Tcl_SetObjResult(interp, ErrorToObj("broadcast not supported under ipv6")); return TCL_ERROR; } result = Tcl_GetInt(interp, newValue, &tmp); if (result == TCL_OK ) { if (setsockopt(statePtr->sock, SOL_SOCKET, SO_BROADCAST, (const char *)&tmp, sizeof(int))) { Tcl_SetObjResult(interp, Tcl_NewStringObj("error setting -broadcast",-1)); result = TCL_ERROR; } else { Tcl_SetObjResult(interp, Tcl_NewIntObj(tmp)); } } return result; } /* * ---------------------------------------------------------------------- * udpSetRemoteOption -- * * Handle remote port/host configuration requests. * * ---------------------------------------------------------------------- */ static int udpSetRemoteOption(UdpState *statePtr, Tcl_Interp *interp,CONST84 char *newValue) { int result; Tcl_Obj *valPtr; int len; valPtr = Tcl_NewStringObj(newValue, -1); result = Tcl_ListObjLength(interp, valPtr, &len); if (result == TCL_OK) { if (len < 1 || len > 2) { Tcl_SetResult(interp, "wrong # args", TCL_STATIC); result = TCL_ERROR; } else { Tcl_Obj *hostPtr, *portPtr; Tcl_ListObjIndex(interp, valPtr, 0, &hostPtr); strcpy(statePtr->remotehost, Tcl_GetString(hostPtr)); if (len == 2) { Tcl_ListObjIndex(interp, valPtr, 1, &portPtr); result = udpGetService(interp, Tcl_GetString(portPtr), &(statePtr->remoteport)); } } } if (result==TCL_ERROR) { Tcl_SetObjResult(interp, Tcl_NewStringObj("error setting -remote",-1)); } else { Tcl_SetObjResult(interp, Tcl_NewStringObj(newValue,-1)); } return result; } /* * ---------------------------------------------------------------------- * udpSetMulticastAddOption -- * * Handle multicast add configuration requests. * * ---------------------------------------------------------------------- */ static int udpSetMulticastAddOption(UdpState *statePtr, Tcl_Interp *interp,CONST84 char *newValue) { int result; if (statePtr->ss_family == AF_INET) { result = UdpMulticast(statePtr, interp, (const char *)newValue, IP_ADD_MEMBERSHIP); } else { result = UdpMulticast(statePtr, interp, (const char *)newValue, IPV6_JOIN_GROUP); } return result; } /* * ---------------------------------------------------------------------- * udpSetMulticastDropOption -- * * Handle multicast drop configuration requests. * * ---------------------------------------------------------------------- */ static int udpSetMulticastDropOption(UdpState *statePtr, Tcl_Interp *interp,CONST84 char *newValue) { int result; if (statePtr->ss_family == AF_INET) { result = UdpMulticast(statePtr, interp, (const char *)newValue, IP_DROP_MEMBERSHIP); } else { result = UdpMulticast(statePtr, interp, (const char *)newValue, IPV6_LEAVE_GROUP); } if (result==TCL_ERROR) { Tcl_SetObjResult(interp, Tcl_NewStringObj("error setting -mcastdrop",-1)); } return result; } static Tcl_Obj * ErrorToObj(const char * prefix) { Tcl_Obj *errObj; #ifdef WIN32 LPVOID sMsg; |
︙ | ︙ |
Changes to generic/udp_tcl.h.
1 2 3 4 5 6 7 8 9 | /* *---------------------------------------------------------------------- * UDP Extension for Tcl 8.4 * * Copyright (c) 1999-2003 by Columbia University; all rights reserved * Copyright (c) 2003-2005 Pat Thoyts <[email protected]> * * Written by Xiaotao Wu * | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 | /* *---------------------------------------------------------------------- * UDP Extension for Tcl 8.4 * * Copyright (c) 1999-2003 by Columbia University; all rights reserved * Copyright (c) 2003-2005 Pat Thoyts <[email protected]> * * Written by Xiaotao Wu * * $Id: udp_tcl.h,v 1.12 2014/02/13 20:49:57 huubeikens Exp $ *---------------------------------------------------------------------- */ #ifndef UDP_TCL_H #define UDP_TCL_H #ifdef HAVE_CONFIG_H |
︙ | ︙ | |||
39 40 41 42 43 44 45 46 47 48 49 50 51 52 | # if HAVE_STDINT_H # include <stdint.h> # endif # include <sys/socket.h> # include <netinet/in.h> # include <arpa/inet.h> # include <netdb.h> #endif /* WIN32 */ #include <stdio.h> #include <string.h> #include <limits.h> #include <errno.h> #include <sys/types.h> | > | 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 | # if HAVE_STDINT_H # include <stdint.h> # endif # include <sys/socket.h> # include <netinet/in.h> # include <arpa/inet.h> # include <netdb.h> # include <net/if.h> #endif /* WIN32 */ #include <stdio.h> #include <string.h> #include <limits.h> #include <errno.h> #include <sys/types.h> |
︙ | ︙ | |||
89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 | HWND hwnd; PacketList *packets; PacketList *packetsTail; int packetNum; struct UdpState *next; Tcl_ThreadId threadId; /* for Tcl_ThreadAlert */ #endif int multicast; /* indicator set for multicast add */ Tcl_Obj *groupsObj; /* list of the mcast groups */ } UdpState; EXTERN int Udp_Init(Tcl_Interp *interp); EXTERN int Udp_SafeInit(Tcl_Interp *interp); #endif | > | 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 | HWND hwnd; PacketList *packets; PacketList *packetsTail; int packetNum; struct UdpState *next; Tcl_ThreadId threadId; /* for Tcl_ThreadAlert */ #endif short ss_family; /* indicator set for ipv4 or ipv6 usage */ int multicast; /* indicator set for multicast add */ Tcl_Obj *groupsObj; /* list of the mcast groups */ } UdpState; EXTERN int Udp_Init(Tcl_Interp *interp); EXTERN int Udp_SafeInit(Tcl_Interp *interp); #endif |
Changes to tests/udp-srv.test.
︙ | ︙ | |||
51 52 53 54 55 56 57 | set ::done 1 } } set timeout [after %TIMEOUT ::DoTimeout] fconfigure stdout -buffering line fconfigure stdin -buffering line | | | | | 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 | set ::done 1 } } set timeout [after %TIMEOUT ::DoTimeout] fconfigure stdout -buffering line fconfigure stdin -buffering line set socket [udp_open %OPTIONS] fconfigure $socket -buffering none -encoding binary -translation binary fileevent $socket readable [list ReadSock $socket] fileevent stdin readable [list ReadControl stdin] Wait 100 puts ready puts [fconfigure $socket -myport] vwait ::done after cancel $timeout close $socket Wait 100 exit } proc Wait {n} { set ::forever 0 after $n {set ::forever 1} vwait ::forever } proc createChildProcess {filename {timeout 5000} {udp_open_options {}}} { file delete -force $filename set f [open $filename w] puts $f [string map [list %TIMEOUT $timeout %OPTIONS $udp_open_options] $::script] close $f set p [open |[list [interpreter] $filename] r+] fconfigure $p -buffering line gets $p line return $p } |
︙ | ︙ | |||
106 107 108 109 110 111 112 | default { return -code error "invalid command \"$cmd\": must be one of start or display" } } return } | < | > > | | 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 | default { return -code error "invalid command \"$cmd\": must be one of start or display" } } return } test udp-srv-1 {basic server operation (ascii)} -constraints {stdio} -setup { set child [createChildProcess $::scriptName 10000] gets $child port } -body { set u [udp_open] fconfigure $u -remote [list localhost $port] puts -nonewline $u "abcdefgh" close $u Wait 100 gets $child r lindex $r 1 } -cleanup { puts "closing child process $child" closeChildProcess $child puts "closed..." } -result {8} test udp-srv-2 {basic server operation (binary)} -constraints {stdio} -setup { set child [createChildProcess $::scriptName] gets $child port } -body { set u [udp_open] fconfigure $u -remote [list localhost $port] puts -nonewline $u "\0\1\2\3\4\5\6\7" |
︙ | ︙ | |||
292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 | incr r } set r } -cleanup { timestamp display 6.3 $t closeChildProcess $child } -result {10000} # ------------------------------------------------------------------------- file delete -force $::scriptName ::tcltest::cleanupTests return # Local variables: # mode: tcl # End: | > | 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 | incr r } set r } -cleanup { timestamp display 6.3 $t closeChildProcess $child } -result {10000} # ------------------------------------------------------------------------- file delete -force $::scriptName ::tcltest::cleanupTests return # Local variables: # mode: tcl # End: |
Changes to tests/udp.test.
1 2 3 4 5 6 7 8 9 10 11 | # Commands covered: udp_open udp_conf udp_peek # # This file contains a collection of tests for one or more of the Tcl # UDP package commands. Sourcing this file into Tcl runs the tests and # generates output for errors. No output means no errors were found. # # Copyright (c) 2003 by Pat Thoyts <[email protected]> # # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 | # Commands covered: udp_open udp_conf udp_peek # # This file contains a collection of tests for one or more of the Tcl # UDP package commands. Sourcing this file into Tcl runs the tests and # generates output for errors. No output means no errors were found. # # Copyright (c) 2003 by Pat Thoyts <[email protected]> # # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # # RCS: @(#) $Id: udp.test,v 1.9 2014/02/13 20:49:57 huubeikens Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest namespace import ::tcltest::* } package require udp |
︙ | ︙ | |||
161 162 163 164 165 166 167 | test udp-3.7 {-mcastloop invalid option} -setup { set s [udp_open] } -body { fconfigure $s -mcastloop stupid } -cleanup { close $s | | | 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 | test udp-3.7 {-mcastloop invalid option} -setup { set s [udp_open] } -body { fconfigure $s -mcastloop stupid } -cleanup { close $s } -returnCodes error -match glob -result {error setting -mcastloop*} test udp-3.8 {-mcastloop is boolean - 1/0} -setup { set s [udp_open] } -body { set a [list [fconfigure $s -mcastloop 1]] lappend a [fconfigure $s -mcastloop 0] set a |
︙ | ︙ | |||
201 202 203 204 205 206 207 208 209 210 211 212 213 214 | set s [udp_open] } -body { set a [list [fconfigure $s -mcastloop on]] lappend a [fconfigure $s -mcastloop off] } -cleanup { close $s } -result {1 0} test udp-4.0 {udp_peek} -constraints unix -setup { set s [udp_open] } -body { udp_peek $s } -cleanup { close $s | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | > > > | | > > > > > > > > > > > > > > > > > > > > > | 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 | set s [udp_open] } -body { set a [list [fconfigure $s -mcastloop on]] lappend a [fconfigure $s -mcastloop off] } -cleanup { close $s } -result {1 0} test udp-3.12 {test -mcastadd with network interface} -constraints win -setup { set s [udp_open] } -body { set a [fconfigure $s -mcastadd {224.0.10.10 1}] set a [fconfigure $s -mcastadd {224.0.10.11 1}] } -cleanup { close $s } -result {{224.0.10.10 1} {224.0.10.11 1}} test udp-3.13 {test -mcastadd with invalid network interface} -constraints win -setup { set s [udp_open] } -body { set a [fconfigure $s -mcastadd {224.0.10.11 notanumber}] } -cleanup { close $s } -returnCodes error -match glob -result {*} test udp-3.14 {test -mcastadd with network interface} -constraints unix -setup { set s [udp_open] } -body { set error 0 # loopback interface is either lo (linux) or lo0 (mac) if {[catch {fconfigure $s -mcastadd {224.0.10.10 lo}}] ^ [catch {fconfigure $s -mcastadd {224.0.10.10 lo0}}]} { set error 1 } } -cleanup { close $s } -result {1} test udp-3.15 {test -mcastadd with invalid network interface} -constraints unix -setup { set s [udp_open] } -body { set a [fconfigure $s -mcastadd {224.0.10.11 averylongwronginterface}] } -cleanup { close $s } -returnCodes error -match glob -result {*} test udp-3.16 {test -mcastadd with invalid network interface} -constraints unix -setup { set s [udp_open] } -body { set a [fconfigure $s -mcastadd {224.0.10.11 wrongif}] } -cleanup { close $s } -returnCodes error -match glob -result {*} test udp-4.0 {udp_peek} -constraints unix -setup { set s [udp_open] } -body { udp_peek $s } -cleanup { close $s } -result {} test udp-4.1 {udp_peek} -constraints unix -setup { set s [udp_open 9009] fconfigure $s -mcastadd 224.0.10.10 -remote [list 224.0.10.10 9009] fconfigure $s -buffering none -blocking 0 } -body { puts $s "message" udp_peek $s } -cleanup { close $s } -result {message} test udp-4.2 "udp_peek: bug #1828920 - args" -constraints unix -setup { set s [udp_open] } -body { udp_peek } -cleanup { close $s } -returnCodes error -match glob -result {wrong * args: *} test udp-5.0 {udp_open with reused port} -body { set s [udp_open 9001 reuse] set u [udp_open 9001 reuse] } -cleanup { close $s } -match regexp -result {sock\d+} test udp-5.0 {udp_open with no port reuse option} -body { set s [udp_open 9001 reuse] catch {set u [udp_open 9001]} error } -cleanup { close $s close $u } -match glob -result {1} test udp-6.0 {udp_open with ipv6} -body { set s [udp_open 9001 ipv6] } -cleanup { close $s } -match regexp -result {sock\d+} test udp-10.1 "bug #1838467 - crash on exit" -setup { set s [udp_open] } -body { # Note: this test actually causes a crash on process exit when it # fails. The socket needs to be left open ... fconfigure $s -mcastadd 224.0.10.10 |
︙ | ︙ |
Changes to win/makefile.vc.
︙ | ︙ | |||
14 15 16 17 18 19 20 | # Copyright (c) 1995-1996 Sun Microsystems, Inc. # Copyright (c) 1998-2000 Ajuba Solutions. # Copyright (c) 2001 ActiveState Corporation. # Copyright (c) 2001-2002 David Gravereaux. # Copyright (c) 2003 Pat Thoyts # #------------------------------------------------------------------------- | | | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | # Copyright (c) 1995-1996 Sun Microsystems, Inc. # Copyright (c) 1998-2000 Ajuba Solutions. # Copyright (c) 2001 ActiveState Corporation. # Copyright (c) 2001-2002 David Gravereaux. # Copyright (c) 2003 Pat Thoyts # #------------------------------------------------------------------------- # RCS: @(#)$Id: makefile.vc,v 1.8 2014/02/13 20:49:57 huubeikens Exp $ #------------------------------------------------------------------------- !if !defined(MSDEVDIR) && !defined(MSVCDIR) && !defined(VCToolkitInstallDir) MSG = ^ You will need to run vcvars32.bat from Developer Studio, first, to setup^ the environment. Jump to this line to read the new instructions. !error $(MSG) |
︙ | ︙ | |||
152 153 154 155 156 157 158 | # binary here. # #------------------------------------------------------------------------- PROJECT = udp !include "rules.vc" | | | 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 | # binary here. # #------------------------------------------------------------------------- PROJECT = udp !include "rules.vc" DOTVERSION = 1.0.10 VERSION = $(DOTVERSION:.=) STUBPREFIX = $(PROJECT)stub DLLOBJS = \ $(TMP_DIR)\udp_tcl.obj \ $(TMP_DIR)\tcludp.res |
︙ | ︙ | |||
256 257 258 259 260 261 262 | !if $(DEBUG) ldebug = -debug:full -debugtype:cv !else ldebug = -release -opt:ref -opt:icf,3 !endif ### Declarations common to all linker options | | | 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 | !if $(DEBUG) ldebug = -debug:full -debugtype:cv !else ldebug = -release -opt:ref -opt:icf,3 !endif ### Declarations common to all linker options lflags = -nologo -machine:$(MACHINE) $(ldebug) /verbose:lib !if $(PROFILE) lflags = $(lflags) -profile !endif !if $(ALIGN98_HACK) && !$(STATIC_BUILD) ### Align sections for PE size savings. |
︙ | ︙ |