Changeset 4692:834121094e10 in roaraudio

Timestamp:

12/28/10 16:18:10 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

some more debug lions

Location:

libroar

Files:

• socket.c (modified) (7 diffs)
• vio.c (modified) (2 diffs)

libroar/socket.c

@@ -397 +397 @@
  char * proxy_type = getenv("ROAR_PROXY");
 
+ ROAR_DBG("roar_socket_connect(host='%s', port=%i) = ?", host, port);
+
  if ( proxy_type == NULL || strcmp(proxy_type, "") == 0 ) {
   return roar_socket_open(MODE_CONNECT, ROAR_SOCKET_TYPE_UNKNOWN, host, port);
@@ -527 +529 @@
  char * del;
 #endif
+
+ ROAR_DBG("roar_socket_open(mode=%i, type=%i, host='%s', port=%i) = ?", mode, type, host, port);
 
  if ( mode == MODE_LISTEN )
@@ -550 +554 @@
 
 
+ ROAR_DBG("roar_socket_open(mode=%i, type=%i, host='%s', port=%i) = ?", mode, type, host, port);
+
  ROAR_DBG("roar_socket_open(*): type=%s, host='%s', port=%i",
              type == ROAR_SOCKET_TYPE_UNIX ? "UNIX" : "???", host, port);
@@ -614 +620 @@
   }
 
+   ROAR_DBG("roar_socket_open(*): he=%p", he);
+
    memcpy((struct in_addr *)&socket_addr.in.sin_addr, he->h_addr, sizeof(struct in_addr));
 
@@ -622 +630 @@
   fh = roar_socket_new_tcp();
 
+  ROAR_DBG("roar_socket_open(*): fh=%i", fh);
+
   if ( fh == -1 ) {
    ROAR_ERR("roar_socket_open(*): Can\'t create TCP socket: %s", strerror(errno));
@@ -628 +638 @@
 
   ROAR_DBG("roar_socket_open(*) = ?");
+
+  ROAR_DBG("roar_socket_open(*): fh=%i", fh);
 
    if ( mode_func(fh, (struct sockaddr *)&socket_addr.in, sizeof(struct sockaddr_in)) == -1 ) {
@@ -634 +646 @@
     return -1;
    }
+
+  ROAR_DBG("roar_socket_open(*): fh=%i", fh);
+
   // hey! we have a socket...
   ROAR_DBG("roar_socket_open(*) = ? // we have a socket :)");
 #else
+  ROAR_DBG("roar_socket_open(*) = -1 // no IPv4 or IPv6 support");
   return -1;
 #endif

libroar/vio.c

@@ -295 +295 @@
  int fh;
 
+ ROAR_DBG("roar_vio_simple_new_stream_obj(*) = ?");
+
  if ( calls == NULL )
   return -1;
@@ -304 +306 @@
  if ( (fh = roar_simple_new_stream_obj(con, s, rate, channels, bits, codec, dir)) == -1 ) {
   roar_libroar_warn();
+  ROAR_DBG("roar_vio_simple_new_stream_obj(*) = -1");
   return -1;
  }
  roar_libroar_warn();
+
+ ROAR_DBG("roar_vio_simple_new_stream_obj(*): fh=%i", fh);
 
  return roar_vio_open_fh_socket(calls, fh);