Attachment 50932 Details for Bug 118878

[patch] xinetd.deadlock.patch

xinetd.deadlock.patch (text/plain), 2.43 KB, created by Olaf Hering on 2005-09-27 12:44:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olaf Hering

Created: 2005-09-27 12:44:54 UTC

Size: 2.43 KB

patch

obsolete

> xinetd/builtins.c |    2 +-
> xinetd/tcpint.c   |    4 ++--
> xinetd/udpint.c   |    4 ++--
> xinetd/util.c     |    2 +-
> 4 files changed, 6 insertions(+), 6 deletions(-)
>
>Index: xinetd-2.3.13/xinetd/util.c
>===================================================================
>--- xinetd-2.3.13.orig/xinetd/util.c
>+++ xinetd-2.3.13/xinetd/util.c
>@@ -234,7 +234,7 @@ void tabprint( int fd, int tab_level, co
> void drain( int sd )
> {
>    char buf[ 256 ] ; /* This size is arbitrarily chosen */
>-   char cc ;
>+   size_t cc ;
>    int old_val ;
> 
>    /* Put in non-blocking mode so we don't hang. */
>Index: xinetd-2.3.13/xinetd/builtins.c
>===================================================================
>--- xinetd-2.3.13.orig/xinetd/builtins.c
>+++ xinetd-2.3.13/xinetd/builtins.c
>@@ -187,7 +187,7 @@ static void dgram_echo( const struct ser
> {
>    char            buf[ DATAGRAM_SIZE ] ;
>    union xsockaddr lsin;
>-   int             cc ;
>+   size_t          cc ;
>    unsigned int    sin_len = 0;
>    int             descriptor = SERVER_FD( serp ) ;
>    const char     *func = "dgram_echo";
>Index: xinetd-2.3.13/xinetd/tcpint.c
>===================================================================
>--- xinetd-2.3.13.orig/xinetd/tcpint.c
>+++ xinetd-2.3.13/xinetd/tcpint.c
>@@ -273,7 +273,7 @@ static void connection_request( struct i
> static stream_status_e tcp_local_to_remote( channel_s *chp )
> {
>    char  buf[ DATAGRAM_SIZE ] ;
>-   int   rcc, wcc ;
>+   size_t   rcc, wcc ;
>    char *p ;
>    int   left ;
>    const char *func = "tcp_local_to_remote" ;
>@@ -326,7 +326,7 @@ static stream_status_e tcp_local_to_remo
> static stream_status_e tcp_remote_to_local( channel_s *chp )
> {
>    char  buf[ DATAGRAM_SIZE ] ;
>-   int   rcc, wcc ;
>+   size_t   rcc, wcc ;
>    int   left ;
>    char *p ;
>    const char *func = "tcp_remote_to_local" ;
>Index: xinetd-2.3.13/xinetd/udpint.c
>===================================================================
>--- xinetd-2.3.13.orig/xinetd/udpint.c
>+++ xinetd-2.3.13/xinetd/udpint.c
>@@ -264,7 +264,7 @@ static status_e get_incoming_packet( str
> 
>    for ( ;; )
>    {
>-      int cc ;
>+      size_t cc ;
> 
>       from_len = sizeof( pp->from ) ;
>       cc = recvfrom( INT_REMOTE( ip ), pp->data, pp->size,
>@@ -306,7 +306,7 @@ static status_e get_incoming_packet( str
> static status_e udp_local_to_remote( channel_s *chp )
> {
>    char   buf[ MAX_DATAGRAM_SIZE ] ;
>-   int    cc ;
>+   size_t    cc ;
>    const char   *func = "udp_local_to_remote" ;
> 
>    for ( ;; )

Actions: View | Diff

Attachments on bug 118878: 50932