Changeset 5253:a9d4cba9e8dc in roaraudio for libroar/vio_socket.c

Timestamp:

11/13/11 17:01:45 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

improved situation on opening files with DSTR/old roar_vio_open_file()

File:

• libroar/vio_socket.c (modified) (7 diffs)

libroar/vio_socket.c

@@ -493 +493 @@
 
 // AF_UNIX:
-int     roar_vio_socket_init_unix_def     (struct roar_vio_defaults * def, char * path) {
+int     roar_vio_socket_init_unix_def     (struct roar_vio_defaults * def, const char * path) {
 #if defined(ROAR_HAVE_UNIX) && defined(_CAN_OPERATE)
  if ( def == NULL || path == NULL )
@@ -519 +519 @@
   return -1;
 
- if ( (node = def->d.socket.host) == NULL )
+ if ( def->d.socket.host == NULL )
+  return -1;
+
+ if ( (node = roar_mm_strdup(def->d.socket.host)) == NULL )
   return -1;
 
@@ -525 +528 @@
   *ed = 0;
 
- if ( (ne = getnodebyname(node)) == NULL ) {
+ ne = getnodebyname(node);
+
+ roar_mm_free(ed);
+
+ if ( ne == NULL ) {
   ROAR_ERR("roar_vio_socket_init_decnetnode_def(*): Can\'t resolve node name '%s'", node);
-  if ( ed != NULL ) *ed = '/';
   return -1;
  }
@@ -533 +539 @@
  memcpy(&(def->d.socket.sa.dn.sdn_add.a_addr), ne->n_addr, 2);
 
- if ( ed != NULL ) *ed = '/';
-
-
- return 0;
-#else
- return -1;
-#endif
-}
-
-int     roar_vio_socket_init_decnet_def   (struct roar_vio_defaults * def, char * node, int object, char * objname) {
+ return 0;
+#else
+ return -1;
+#endif
+}
+
+int     roar_vio_socket_init_decnet_def   (struct roar_vio_defaults * def, const char * node, int object, char * objname) {
 #if defined(ROAR_HAVE_LIBDNET) && defined(_CAN_OPERATE)
  struct sockaddr_dn * dn;
@@ -626 +629 @@
 }
 
-int     roar_vio_socket_init_inet4_def    (struct roar_vio_defaults * def, char * host, int port, int type) {
+int     roar_vio_socket_init_inet4_def    (struct roar_vio_defaults * def, const char * host, int port, int type) {
 #if defined(ROAR_HAVE_IPV4) && defined(_CAN_OPERATE)
  if ( roar_vio_socket_init_socket_def(def, AF_INET, type) == -1 )
@@ -641 +644 @@
 }
 
-int     roar_vio_socket_init_tcp4_def     (struct roar_vio_defaults * def, char * host, int port) {
+int     roar_vio_socket_init_tcp4_def     (struct roar_vio_defaults * def, const char * host, int port) {
  return roar_vio_socket_init_inet4_def(def, host, port, SOCK_STREAM);
 }
 
-int     roar_vio_socket_init_udp4_def     (struct roar_vio_defaults * def, char * host, int port) {
+int     roar_vio_socket_init_udp4_def     (struct roar_vio_defaults * def, const char * host, int port) {
  return roar_vio_socket_init_inet4_def(def, host, port, SOCK_DGRAM);
 }
@@ -652 +655 @@
 // AF_INET6:
 int     roar_vio_socket_init_inet6host_def(struct roar_vio_defaults * def);
-int     roar_vio_socket_init_inet6_def    (struct roar_vio_defaults * def, char * host, int port, int type) {
- return -1;
-}
-
-int     roar_vio_socket_init_tcp6_def     (struct roar_vio_defaults * def, char * host, int port) {
+int     roar_vio_socket_init_inet6_def    (struct roar_vio_defaults * def, const char * host, int port, int type) {
+ return -1;
+}
+
+int     roar_vio_socket_init_tcp6_def     (struct roar_vio_defaults * def, const char * host, int port) {
  return roar_vio_socket_init_inet6_def(def, host, port, SOCK_STREAM);
 }
 
-int     roar_vio_socket_init_udp6_def     (struct roar_vio_defaults * def, char * host, int port) {
+int     roar_vio_socket_init_udp6_def     (struct roar_vio_defaults * def, const char * host, int port) {
  return roar_vio_socket_init_inet6_def(def, host, port, SOCK_DGRAM);
 }