Changeset 5114:82426e175a9d in roaraudio


Ignore:
Timestamp:
08/01/11 01:49:17 (13 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

added extra const keywords for server names as well as client names

Files:
8 edited

Legend:

Unmodified
Added
Removed

  • include/libroar/basic.h

    r5109 r5114  
    7676 
    7777 
    78 int roar_connect_raw  (char * server) _LIBROAR_ATTR_DEPRECATED; 
    79 int roar_connect_raw2 (char * server, int flags, uint_least32_t timeout); 
     78int roar_connect_raw  (const char * server) _LIBROAR_ATTR_DEPRECATED; 
     79int roar_connect_raw2 (const char * server, int flags, uint_least32_t timeout); 
    8080 
    81 int roar_connect      (struct roar_connection * con, char * server) _LIBROAR_ATTR_DEPRECATED; 
    82 int roar_connect2     (struct roar_connection * con, char * server, int flags, uint_least32_t timeout); 
     81int roar_connect      (struct roar_connection * con, const char * server) _LIBROAR_ATTR_DEPRECATED; 
     82int roar_connect2     (struct roar_connection * con, const char * server, int flags, uint_least32_t timeout); 
    8383int roar_connect_fh   (struct roar_connection * con, int fh); 
    8484int roar_get_connection_fh  (struct roar_connection * con); 
    … …  
    9898int roar_noop         (struct roar_connection * con); 
    9999 
    100 int roar_identify     (struct roar_connection * con, char * name); 
     100int roar_identify     (struct roar_connection * con, const char * name); 
    101101 
    102102int roar_send_message (struct roar_connection * con, struct roar_message * mes, char *  data); 

  • include/libroar/simple.h

    r5109 r5114  
    3939#include "libroar.h" 
    4040 
    41 int roar_simple_connect (struct roar_connection * con, char * server, char * name); 
    42 int roar_simple_connect2(struct roar_connection * con, char * server, char * name, int flags, uint_least32_t timeout); 
     41int roar_simple_connect (struct roar_connection * con, const char * server, const char * name); 
     42int roar_simple_connect2(struct roar_connection * con, const char * server, const char * name, int flags, uint_least32_t timeout); 
    4343 
    44 int roar_simple_stream  (int rate, int channels, int bits, int codec, char * server, int dir, char * name) _LIBROAR_ATTR_DEPRECATED; 
    45 int roar_simple_stream_obj  (struct roar_stream * s, int rate, int channels, int bits, int codec, char * server, int dir, char * name) _LIBROAR_ATTR_DEPRECATED; 
     44int roar_simple_stream  (int rate, int channels, int bits, int codec, const char * server, int dir, const char * name) _LIBROAR_ATTR_DEPRECATED; 
     45int roar_simple_stream_obj  (struct roar_stream * s, int rate, int channels, int bits, int codec, const char * server, int dir, char * name) _LIBROAR_ATTR_DEPRECATED; 
    4646 
    4747int roar_simple_new_stream_attachexeced_obj (struct roar_connection * con, struct roar_stream * s, int rate, int channels, int bits, int codec, int dir); 

  • include/libroar/vio.h

    r5109 r5114  
    9191 
    9292int     roar_vio_simple_stream (struct roar_vio_calls * calls, int rate, int channels, int bits, int codec, 
    93                                                                char * server, int dir, char * name); 
     93                                                               const char * server, int dir, const char * name); 
    9494 
    9595int     roar_vio_simple_new_stream_obj (struct roar_vio_calls * calls, 

  • libroar/basic.c

    r5109 r5114  
    3636#include "libroar.h" 
    3737 
    38 int roar_connect_raw (char * server) { 
     38int roar_connect_raw (const char * server) { 
    3939 return roar_connect_raw2(server, 0, 0); 
    4040} 
    4141 
    42 int roar_connect_raw2 (char * server, int flags, uint_least32_t timeout) { 
     42int roar_connect_raw2 (const char * server, int flags, uint_least32_t timeout) { 
    4343#ifdef ROAR_HAVE_LIBSLP 
    4444 struct roar_libroar_config * config = roar_libroar_get_config(); 
    4545#endif 
    46  char user_sock[80]; 
     46 char user_sock[128]; 
    4747 char * roar_server; 
    4848 int i = 0; 
    … …  
    5050 int fh = -1; 
    5151 int is_decnet = 0; 
    52  char * obj = NULL; 
     52 const char * obj = NULL; 
    5353#if !defined(ROAR_TARGET_WIN32) && !defined(ROAR_TARGET_MICROCONTROLLER) 
    5454 struct passwd * pwd; 
    … …  
    9292 
    9393#if !defined(ROAR_TARGET_WIN32) && !defined(ROAR_TARGET_MICROCONTROLLER) 
    94  if ( server == NULL && (i = readlink("/etc/roarserver", user_sock, 79)) != -1 ) { 
     94 if ( server == NULL && (i = readlink("/etc/roarserver", user_sock, sizeof(user_sock)-1)) != -1 ) { 
    9595   user_sock[i] = 0; 
    9696   server = user_sock; 
    … …  
    127127  } 
    128128 
    129   snprintf(user_sock, 79, "%s/%s", roar_server, ROAR_DEFAULT_SOCK_USER); 
     129  snprintf(user_sock, sizeof(user_sock)-1, "%s/%s", roar_server, ROAR_DEFAULT_SOCK_USER); 
     130  user_sock[sizeof(user_sock)-1] = 0; 
    130131 
    131132  if ( (fh = roar_socket_connect(user_sock, 0)) != -1 ) 
    … …  
    189190  /* connect via (char*)server */ 
    190191  // find a port: 
    191   if ( *server != '/' ) { // don't test AF_UNIX sockets for ports 
    192    for (i = 0; server[i] != 0; i++) { 
    193     if ( server[i] == ':' ) { 
    194      if ( server[i+1] == ':' ) { // DECnet, leave unchanged 
     192 
     193  strncat(user_sock, server, sizeof(user_sock)-1); 
     194  user_sock[sizeof(user_sock)-1] = 0; 
     195  server = user_sock; 
     196 
     197  if ( *user_sock != '/' ) { // don't test AF_UNIX sockets for ports 
     198   for (i = 0; user_sock[i] != 0; i++) { 
     199    if ( user_sock[i] == ':' ) { 
     200     if ( user_sock[i+1] == ':' ) { // DECnet, leave unchanged 
    195201      is_decnet = 1; 
    196       obj = &server[i+2]; 
     202      obj = &user_sock[i+2]; 
    197203      break; 
    198204     } 
    199205 
    200      port = atoi(server+i+1); 
    201      server[i] = 0; 
     206     port = atoi(&(user_sock[i+1])); 
     207     user_sock[i] = 0; 
    202208     break; 
    203209    } 
    … …  
    206212 
    207213  if ( is_decnet ) { 
    208     *user_sock = 0; 
    209    if ( *server == ':' ) { 
     214   if ( *user_sock == ':' ) { 
    210215    if ( roar_socket_get_local_nodename() ) 
    211      strncat(user_sock, roar_socket_get_local_nodename(), 6); 
    212    } 
    213  
    214    strncat(user_sock, server, 79); 
    215    server = user_sock; 
     216     roar_mm_strlcat(user_sock, roar_socket_get_local_nodename(), sizeof(user_sock)-1); 
     217     user_sock[sizeof(user_sock)-1] = 0; 
     218   } 
     219 
    216220   if ( *obj == 0 ) { 
    217221#ifdef DN_MAXOBJL 
    218     strncat(user_sock, ROAR_DEFAULT_OBJECT, DN_MAXOBJL+2); 
     222    roar_mm_strlcat(user_sock, ROAR_DEFAULT_OBJECT, sizeof(user_sock)-1); 
     223    user_sock[sizeof(user_sock)-1] = 0; 
    219224#else 
    220225    ROAR_ERR("roar_connect_raw2(*): size of DECnet object unknown."); 
    … …  
    224229 
    225230  if ( port || is_decnet ) { 
    226    fh = roar_socket_connect(server, port); 
     231   fh = roar_socket_connect(user_sock, port); 
    227232   // restore the original string 
    228    server[i] = ':'; 
     233   user_sock[i] = ':'; 
    229234  } else { 
    230    fh = roar_socket_connect(server, ROAR_DEFAULT_PORT); 
     235   fh = roar_socket_connect(user_sock, ROAR_DEFAULT_PORT); 
    231236  } 
    232237 } 
    … …  
    240245} 
    241246 
    242 int roar_connect    (struct roar_connection * con, char * server) { 
     247int roar_connect    (struct roar_connection * con, const char * server) { 
    243248 return roar_connect2(con, server, 0, 0); 
    244249} 
    245250 
    246 int roar_connect2     (struct roar_connection * con, char * server, int flags, uint_least32_t timeout) { 
     251int roar_connect2     (struct roar_connection * con, const char * server, int flags, uint_least32_t timeout) { 
    247252 int fh; 
    248253 
    … …  
    381386} 
    382387 
    383 int roar_identify   (struct roar_connection * con, char * name) { 
     388int roar_identify   (struct roar_connection * con, const char * name) { 
    384389 struct roar_message mes; 
    385390 pid_t pid; 
    … …  
    403408 ROAR_DBG("roar_identify(*): name=%p", name); 
    404409 
    405  max_len = strlen(name); 
     410 max_len = roar_mm_strlen(name); 
    406411 ROAR_DBG("roar_identify(*): strlen(name) = %i", max_len); 
    407412 

  • libroar/enumdev.c

    r5111 r5114  
    5151 ROAR_DBG("_test_server(c=%p{.server='%s', ...}, flags=0x%.4X) = ?", c, c->server, flags); 
    5252 
    53  if ( roar_connect2(&con, (char*)c->server, 0, 0) == -1 ) 
     53 if ( roar_connect2(&con, c->server, 0, 0) == -1 ) 
    5454  return -1; 
    5555 

  • libroar/simple.c

    r5110 r5114  
    3636#include "libroar.h" 
    3737 
    38 int roar_simple_connect (struct roar_connection * con, char * server, char * name) { 
     38int roar_simple_connect (struct roar_connection * con, const char * server, const char * name) { 
    3939 return roar_simple_connect2(con, server, name, 0, 0); 
    4040} 
    4141 
    42 int roar_simple_connect2(struct roar_connection * con, char * server, char * name, int flags, uint_least32_t timeout) { 
     42int roar_simple_connect2(struct roar_connection * con, const char * server, const char * name, int flags, uint_least32_t timeout) { 
    4343 
    4444 ROAR_DBG("roar_simple_connect(*): trying to connect..."); 
    … …  
    6262} 
    6363 
    64 int roar_simple_stream(int rate, int channels, int bits, int codec, char * server, int dir, char * name) { 
     64int roar_simple_stream(int rate, int channels, int bits, int codec, const char * server, int dir, const char * name) { 
    6565 struct roar_stream     s; 
    6666 
    … …  
    7070} 
    7171 
    72 int roar_simple_stream_obj  (struct roar_stream * s, int rate, int channels, int bits, int codec, char * server, int dir, char * name) { 
     72int roar_simple_stream_obj  (struct roar_stream * s, int rate, int channels, int bits, int codec, const char * server, int dir, char * name) { 
    7373 struct roar_connection con; 
    7474 int ret; 

  • libroar/vio.c

    r5109 r5114  
    409409 
    410410int     roar_vio_simple_stream (struct roar_vio_calls * calls, int rate, int channels, int bits, int codec, 
    411                                                                char * server, int dir, char * name) { 
     411                                                               const char * server, int dir, const char * name) { 
    412412 int fh; 
    413413 

  • libroar/vs.c

    r5111 r5114  
    301301 _initerr(); 
    302302 
    303  ret = roar_simple_connect(vss->con, (char*)server, (char*)name); 
     303 ret = roar_simple_connect(vss->con, server, name); 
    304304 
    305305 if ( ret == -1 ) { 
Note: See TracChangeset for help on using the changeset viewer.