Changeset 5554:974f701cf7b5 in roaraudio

Timestamp:

07/07/12 13:55:15 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

support to convert EAI_* error codes (Closes: #255)

Files:

• ChangeLog (modified) (1 diff)
• include/libroar/error.h (modified) (1 diff)
• libroar/error.c (modified) (1 diff)
• libroar/socket.c (modified) (1 diff)

ChangeLog

@@ -5 +5 @@
           (Closes: #176)
         * Done more hardending work.
-        * Improved error handling (including on win32) (Closes: #235)
+        * Improved error handling (including on win32) (Closes: #235, #255)
         * Added small DTMF library.
         * Added filter based on Goertzel algorithm.

include/libroar/error.h

@@ -48 +48 @@
  ROAR_ERROR_TYPE_YIFF,
  ROAR_ERROR_TYPE_APPLICATION,
- ROAR_ERROR_TYPE_HTTP
+ ROAR_ERROR_TYPE_HTTP,
+ ROAR_ERROR_TYPE_EAI /* getaddrinfo() and friends */
 };
 

libroar/error.c

@@ -1016 +1016 @@
  {ROAR_ERROR_TYPE_WINSOCK, WSA_QOS_RESERVED_PETYPE, ROAR_ERROR_???},
 #endif
+#endif
+ {ROAR_ERROR_TYPE_EAI, 0 /* defined value, see manpage */, ROAR_ERROR_NONE},
+#ifdef EAI_ADDRFAMILY
+ {ROAR_ERROR_TYPE_EAI, EAI_ADDRFAMILY, ROAR_ERROR_NOENT},
+#endif
+#ifdef EAI_AGAIN
+ {ROAR_ERROR_TYPE_EAI, EAI_AGAIN, ROAR_ERROR_AGAIN},
+#endif
+#ifdef EAI_BADFLAGS
+ {ROAR_ERROR_TYPE_EAI, EAI_BADFLAGS, ROAR_ERROR_INVAL},
+#endif
+#ifdef EAI_FAIL
+ {ROAR_ERROR_TYPE_EAI, EAI_FAIL, ROAR_ERROR_RIO},
+#endif
+#ifdef EAI_FAMILY
+ {ROAR_ERROR_TYPE_EAI, EAI_FAMILY, ROAR_ERROR_AFNOTSUP},
+#endif
+#ifdef EAI_MEMORY
+ {ROAR_ERROR_TYPE_EAI, EAI_MEMORY, ROAR_ERROR_NOMEM},
+#endif
+#ifdef EAI_NODATA
+ {ROAR_ERROR_TYPE_EAI, EAI_NODATA, ROAR_ERROR_NODATA},
+#endif
+#ifdef EAI_NONAME
+ {ROAR_ERROR_TYPE_EAI, EAI_NONAME, ROAR_ERROR_NOENT},
+#endif
+#ifdef EAI_SERVICE
+ {ROAR_ERROR_TYPE_EAI, EAI_SERVICE, ROAR_ERROR_PROTONOSUP},
+#endif
+#ifdef EAI_SOCKTYPE
+ {ROAR_ERROR_TYPE_EAI, EAI_SOCKTYPE, ROAR_ERROR_INVAL},
+#endif
+#ifdef EAI_SYSTEM
+// {ROAR_ERROR_TYPE_EAI, EAI_SYSTEM, ROAR_ERROR_???},
 #endif
 };

libroar/socket.c

@@ -686 +686 @@
 
   ret = getaddrinfo(host, port_as_string, &hints, &res);
-  switch (ret) {
-   case 0: /* no error */; break;
-#ifdef EAI_ADDRFAMILY
-   case EAI_ADDRFAMILY: roar_err_set(ROAR_ERROR_NOENT);    break;
-#endif
-   case EAI_AGAIN:      roar_err_set(ROAR_ERROR_AGAIN);    break;
-   case EAI_BADFLAGS:   roar_err_set(ROAR_ERROR_INVAL);    break;
-   case EAI_FAIL:       roar_err_set(ROAR_ERROR_RIO);      break;
-   case EAI_FAMILY:     roar_err_set(ROAR_ERROR_AFNOTSUP); break;
-   case EAI_MEMORY:     roar_err_set(ROAR_ERROR_NOMEM);    break;
-#ifdef EAI_NODATA
-   case EAI_NODATA:     roar_err_set(ROAR_ERROR_NODATA);   break;
-#endif
-   case EAI_NONAME:     roar_err_set(ROAR_ERROR_NOENT);    break;
-   case EAI_SERVICE:    roar_err_set(ROAR_ERROR_PROTONOSUP); break;
-   case EAI_SOCKTYPE:   roar_err_set(ROAR_ERROR_INVAL);    break;
-   case EAI_SYSTEM:     roar_err_from_errno();             break;
-   default:
-     roar_err_set(ROAR_ERROR_UNKNOWN);
-    break;
-  }
-  if ( ret != 0 )
-   return -1;
+  if ( ret == EAI_SYSTEM ) {
+   roar_err_from_errno();
+   return -1;
+  } else if ( ret != 0 ) {
+   roar_err_convert(&roar_error, ROAR_ERROR_TYPE_ROARAUDIO, ret, ROAR_ERROR_TYPE_EAI);
+   return -1;
+  }
 
   if ( af_guessed ) {