Changeset 502:f0ef9d157f91 in roaraudio

Timestamp:

08/14/08 17:57:29 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

cleaning up non needed DECnet stuff

Files:

• include/libroar/socket.h (modified) (1 diff)
• libroar/basic.c (modified) (2 diffs)
• libroar/socket.c (modified) (1 diff)
• roard/clients.c (modified) (2 diffs)

include/libroar/socket.h

@@ -47 +47 @@
 int roar_socket_open_socks4a(int mode, int fh, char * host, int port);
 
-#if 0
-#ifdef ROAR_HAVE_LIBDNET
-int roar_accept(int sockfd, struct sockaddr *addr, socklen_t *addrlen);
-#else
-#define roar_accept accept
-#endif
-#endif
-#define roar_accept accept
-
 #endif
 

libroar/basic.c

@@ -153 +153 @@
 int roar_recv_message (struct roar_connection * con, struct roar_message * mes, char ** data) {
  char buf[_ROAR_MESS_BUF_LEN];
-/*
-#ifdef ROAR_HAVE_LIBDNET
- int len;
-#endif
-*/
 
  ROAR_DBG("roar_recv_message(*): try to get a response form the server...");
@@ -164 +159 @@
   *data = NULL;
 
-/*
-#ifdef ROAR_HAVE_LIBDNET
- if ( (len = read(con->fh, buf, _ROAR_MESS_BUF_LEN)) != _ROAR_MESS_BUF_LEN ) {
-  if ( len != 0 )
-   return -1;
-
-  usleep(2000);
-
-  if ( read(con->fh, buf, _ROAR_MESS_BUF_LEN) != _ROAR_MESS_BUF_LEN )
-   return -1;
-  }
-#else
-*/
  if ( read(con->fh, buf, _ROAR_MESS_BUF_LEN) != _ROAR_MESS_BUF_LEN )
   return -1;
-/*
-#endif
-*/
 
  ROAR_DBG("roar_recv_message(*): Got a header");

libroar/socket.c

@@ -383 +383 @@
 }
 
-#if 0
-#ifdef ROAR_HAVE_LIBDNET
-int roar_accept(int sockfd, struct sockaddr *addr, socklen_t *addrlen) {
- struct sockaddr_dn sockaddr_d, * sockaddr_p = &sockaddr_d;
- socklen_t len = *addrlen;
- int r;
-
- if ( len < sizeof(struct sockaddr_dn) ) {
-  len = sizeof(struct sockaddr_dn);
-  r = accept(sockfd, (struct sockaddr *) sockaddr_p, &len);
-
-  memcpy((void*)addr, (void*) sockaddr_p, len > *addrlen ? *addrlen : len);
-
-  if ( len < *addrlen )
-   *addrlen = len;
-
- } else {
-  r = accept(sockfd, addr, addrlen);
-  sockaddr_p = (struct sockaddr_dn *) addr;
-  len = *addrlen;
- }
-
- if ( r != -1 ) {
-  // do dnet_accept(), but it does nothing at the moment.
- }
-
- return r;
-}
-#endif
-#endif
-
 //ll

roard/clients.c

@@ -95 +95 @@
 
 int clients_set_fh    (int id, int    fh) {
-#ifdef ROAR_HAVE_LIBDNET
- struct sockaddr_dn sockaddr_d;
- socklen_t len = sizeof(struct sockaddr_dn);
-#endif
 
  if ( g_clients[id] == NULL )
@@ -104 +100 @@
 
  g_clients[id]->fh = fh;
-
-#ifdef ROAR_HAVE_LIBDNET
- if ( getsockname(fh, (struct sockaddr *)&sockaddr_d, &len) != -1 ) {
-  if ( sockaddr_d.sdn_family == AF_DECnet )
-   roar_socket_nonblock(fh, ROAR_SOCKET_BLOCK);
- }
-#endif
 
  return 0;