[BACK]Return to sio.c CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2018 / io

Diff for /OpenXM_contrib2/asir2018/io/sio.c between version 1.3 and 1.4

version 1.3, 2019/12/13 14:40:50 version 1.4, 2020/10/06 06:31:20
Line 44 
Line 44 
  * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY   * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,   * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.   * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  * $OpenXM: OpenXM_contrib2/asir2018/io/sio.c,v 1.2 2018/09/21 07:06:51 noro Exp $   * $OpenXM: OpenXM_contrib2/asir2018/io/sio.c,v 1.3 2019/12/13 14:40:50 fujimoto Exp $
 */  */
 #include "ca.h"  #include "ca.h"
 #include <setjmp.h>  #include <setjmp.h>
Line 95  void getremotename(int s,char *name)
Line 95  void getremotename(int s,char *name)
   int peerlen;    int peerlen;
   
   peerlen = sizeof(peer);    peerlen = sizeof(peer);
   getpeername(getremotesocket(s),(struct sockaddr *)&peer,&peerlen);    getpeername(getremotesocket(s),(struct sockaddr *)&peer,(socklen_t *)&peerlen);
   hp = gethostbyaddr((char *)&peer.sin_addr,sizeof(struct in_addr),AF_INET);    hp = gethostbyaddr((char *)&peer.sin_addr,sizeof(struct in_addr),AF_INET);
   if ( hp )    if ( hp )
     strcpy(name,hp->h_name);      strcpy(name,hp->h_name);
Line 172  int try_bind_listen(int use_unix,char *port_str)
Line 172  int try_bind_listen(int use_unix,char *port_str)
     closesocket(service);      closesocket(service);
     return -1;      return -1;
   }    }
   if (getsockname(service,saddr, &len) < 0) {    if (getsockname(service,saddr, (socklen_t *)&len) < 0) {
       perror("in getsockname");        perror("in getsockname");
       closesocket(service);        closesocket(service);
       return -1;        return -1;
Line 209  int try_accept(int af_unix,int s)
Line 209  int try_accept(int af_unix,int s)
   if ( af_unix ) {    if ( af_unix ) {
     len = sizeof(s_un);      len = sizeof(s_un);
     for ( c = -1, i = 0; (c < 0)&&(i = 10) ; i++ )      for ( c = -1, i = 0; (c < 0)&&(i = 10) ; i++ )
       c = accept(s, (struct sockaddr *) &s_un, &len);        c = accept(s, (struct sockaddr *) &s_un, (socklen_t *)&len);
   } else    } else
 #endif  #endif
   {    {
   
     len = sizeof(sin);      len = sizeof(sin);
     for ( c = -1, i = 0; (c < 0)&&(i = 10) ; i++ )      for ( c = -1, i = 0; (c < 0)&&(i = 10) ; i++ )
       c = accept(s, (struct sockaddr *) &sin, &len);        c = accept(s, (struct sockaddr *) &sin, (socklen_t *)&len);
   }    }
   if ( i == 10 )    if ( i == 10 )
     c = -1;      c = -1;

Legend:
Removed from v.1.3  
changed lines
  Added in v.1.4

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>