Changeset 5185:9c42709e2c89 in roaraudio


Ignore:
Timestamp:
10/22/11 19:34:28 (12 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

added server type +invalid

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • libroar/basic.c

    r5148 r5185  
    190190  /* connect via (char*)server */ 
    191191  // find a port: 
     192 
     193  if ( !strcmp(server, "+invalid") ) { 
     194   roar_err_set(ROAR_ERROR_CANCELED); 
     195   return -1; 
     196  } 
    192197 
    193198  strncpy(user_sock, server, sizeof(user_sock)-1); 
     
    242247 } 
    243248 
    244  if ( fh == -1 ) 
    245   roar_err_set(ROAR_ERROR_CONNREFUSED); 
    246  
    247249 ROAR_DBG("roar_connect_raw2(*) = %i", fh); 
    248250 
  • roarclients/roarctl.c

    r5149 r5185  
    252252 
    253253 if ( roar_get_time(con, &time) == -1 ) { 
    254   fprintf(stderr, "Error: can not get server time: %s\n", roar_error2str(roar_error)); 
     254  fprintf(stderr, "Error: can not get server time: %s\n", roar_vs_strerr(roar_error)); 
    255255  return; 
    256256 } 
     
    11141114 
    11151115 if ( roar_simple_connect(&con, server, "roarctl") == -1 ) { 
    1116   fprintf(stderr, "Error: Can not connect to server\n"); 
     1116  fprintf(stderr, "Error: Can not connect to server: %s: %s(%i)\n", 
     1117          server == NULL ? "(default)" : server, roar_vs_strerr(roar_error), roar_error); 
    11171118  return 1; 
    11181119 } 
  • roarclients/roarinterconnect.c

    r5179 r5185  
    297297 } 
    298298 
     299 if ( server != NULL && !strcmp(server, "+invalid") ) { 
     300  return 0; 
     301 } 
     302 
    299303 switch (type & MT_MASK) { 
    300304  case MT_ROAR: 
  • tests/test-runnable.sh

    r3893 r5185  
    1212 printf "%-16s : " "$c" 
    1313 
    14  $EXEC_HELPER $BIN_PATH$c --server '(INVALID)' < /dev/null > /dev/null 2> /dev/null 
     14 $EXEC_HELPER $BIN_PATH$c --server +invalid < /dev/null > /dev/null 2> /dev/null 
    1515 R=$? 
    1616 
Note: See TracChangeset for help on using the changeset viewer.