Changeset 5114:82426e175a9d in roaraudio
- Timestamp:
- 08/01/11 01:49:17 (13 years ago)
- Branch:
- default
- Phase:
- public
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
include/libroar/basic.h
r5109 r5114 76 76 77 77 78 int roar_connect_raw (c har * server) _LIBROAR_ATTR_DEPRECATED;79 int roar_connect_raw2 (c har * server, int flags, uint_least32_t timeout);78 int roar_connect_raw (const char * server) _LIBROAR_ATTR_DEPRECATED; 79 int roar_connect_raw2 (const char * server, int flags, uint_least32_t timeout); 80 80 81 int roar_connect (struct roar_connection * con, c har * server) _LIBROAR_ATTR_DEPRECATED;82 int roar_connect2 (struct roar_connection * con, c har * server, int flags, uint_least32_t timeout);81 int roar_connect (struct roar_connection * con, const char * server) _LIBROAR_ATTR_DEPRECATED; 82 int roar_connect2 (struct roar_connection * con, const char * server, int flags, uint_least32_t timeout); 83 83 int roar_connect_fh (struct roar_connection * con, int fh); 84 84 int roar_get_connection_fh (struct roar_connection * con); … … 98 98 int roar_noop (struct roar_connection * con); 99 99 100 int roar_identify (struct roar_connection * con, c har * name);100 int roar_identify (struct roar_connection * con, const char * name); 101 101 102 102 int roar_send_message (struct roar_connection * con, struct roar_message * mes, char * data); -
include/libroar/simple.h
r5109 r5114 39 39 #include "libroar.h" 40 40 41 int roar_simple_connect (struct roar_connection * con, c har * server,char * name);42 int roar_simple_connect2(struct roar_connection * con, c har * server,char * name, int flags, uint_least32_t timeout);41 int roar_simple_connect (struct roar_connection * con, const char * server, const char * name); 42 int roar_simple_connect2(struct roar_connection * con, const char * server, const char * name, int flags, uint_least32_t timeout); 43 43 44 int roar_simple_stream (int rate, int channels, int bits, int codec, c har * 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, c har * server, int dir, char * name) _LIBROAR_ATTR_DEPRECATED;44 int roar_simple_stream (int rate, int channels, int bits, int codec, const char * server, int dir, const char * name) _LIBROAR_ATTR_DEPRECATED; 45 int 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; 46 46 47 47 int 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 91 91 92 92 int roar_vio_simple_stream (struct roar_vio_calls * calls, int rate, int channels, int bits, int codec, 93 c har * server, int dir,char * name);93 const char * server, int dir, const char * name); 94 94 95 95 int roar_vio_simple_new_stream_obj (struct roar_vio_calls * calls, -
libroar/basic.c
r5109 r5114 36 36 #include "libroar.h" 37 37 38 int roar_connect_raw (c har * server) {38 int roar_connect_raw (const char * server) { 39 39 return roar_connect_raw2(server, 0, 0); 40 40 } 41 41 42 int roar_connect_raw2 (c har * server, int flags, uint_least32_t timeout) {42 int roar_connect_raw2 (const char * server, int flags, uint_least32_t timeout) { 43 43 #ifdef ROAR_HAVE_LIBSLP 44 44 struct roar_libroar_config * config = roar_libroar_get_config(); 45 45 #endif 46 char user_sock[ 80];46 char user_sock[128]; 47 47 char * roar_server; 48 48 int i = 0; … … 50 50 int fh = -1; 51 51 int is_decnet = 0; 52 c har * obj = NULL;52 const char * obj = NULL; 53 53 #if !defined(ROAR_TARGET_WIN32) && !defined(ROAR_TARGET_MICROCONTROLLER) 54 54 struct passwd * pwd; … … 92 92 93 93 #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 ) { 95 95 user_sock[i] = 0; 96 96 server = user_sock; … … 127 127 } 128 128 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; 130 131 131 132 if ( (fh = roar_socket_connect(user_sock, 0)) != -1 ) … … 189 190 /* connect via (char*)server */ 190 191 // 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 195 201 is_decnet = 1; 196 obj = & server[i+2];202 obj = &user_sock[i+2]; 197 203 break; 198 204 } 199 205 200 port = atoi( server+i+1);201 server[i] = 0;206 port = atoi(&(user_sock[i+1])); 207 user_sock[i] = 0; 202 208 break; 203 209 } … … 206 212 207 213 if ( is_decnet ) { 208 *user_sock = 0; 209 if ( *server == ':' ) { 214 if ( *user_sock == ':' ) { 210 215 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 216 220 if ( *obj == 0 ) { 217 221 #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; 219 224 #else 220 225 ROAR_ERR("roar_connect_raw2(*): size of DECnet object unknown."); … … 224 229 225 230 if ( port || is_decnet ) { 226 fh = roar_socket_connect( server, port);231 fh = roar_socket_connect(user_sock, port); 227 232 // restore the original string 228 server[i] = ':';233 user_sock[i] = ':'; 229 234 } else { 230 fh = roar_socket_connect( server, ROAR_DEFAULT_PORT);235 fh = roar_socket_connect(user_sock, ROAR_DEFAULT_PORT); 231 236 } 232 237 } … … 240 245 } 241 246 242 int roar_connect (struct roar_connection * con, c har * server) {247 int roar_connect (struct roar_connection * con, const char * server) { 243 248 return roar_connect2(con, server, 0, 0); 244 249 } 245 250 246 int roar_connect2 (struct roar_connection * con, c har * server, int flags, uint_least32_t timeout) {251 int roar_connect2 (struct roar_connection * con, const char * server, int flags, uint_least32_t timeout) { 247 252 int fh; 248 253 … … 381 386 } 382 387 383 int roar_identify (struct roar_connection * con, c har * name) {388 int roar_identify (struct roar_connection * con, const char * name) { 384 389 struct roar_message mes; 385 390 pid_t pid; … … 403 408 ROAR_DBG("roar_identify(*): name=%p", name); 404 409 405 max_len = strlen(name);410 max_len = roar_mm_strlen(name); 406 411 ROAR_DBG("roar_identify(*): strlen(name) = %i", max_len); 407 412 -
libroar/enumdev.c
r5111 r5114 51 51 ROAR_DBG("_test_server(c=%p{.server='%s', ...}, flags=0x%.4X) = ?", c, c->server, flags); 52 52 53 if ( roar_connect2(&con, (char*)c->server, 0, 0) == -1 )53 if ( roar_connect2(&con, c->server, 0, 0) == -1 ) 54 54 return -1; 55 55 -
libroar/simple.c
r5110 r5114 36 36 #include "libroar.h" 37 37 38 int roar_simple_connect (struct roar_connection * con, c har * server,char * name) {38 int roar_simple_connect (struct roar_connection * con, const char * server, const char * name) { 39 39 return roar_simple_connect2(con, server, name, 0, 0); 40 40 } 41 41 42 int roar_simple_connect2(struct roar_connection * con, c har * server,char * name, int flags, uint_least32_t timeout) {42 int roar_simple_connect2(struct roar_connection * con, const char * server, const char * name, int flags, uint_least32_t timeout) { 43 43 44 44 ROAR_DBG("roar_simple_connect(*): trying to connect..."); … … 62 62 } 63 63 64 int roar_simple_stream(int rate, int channels, int bits, int codec, c har * server, int dir,char * name) {64 int roar_simple_stream(int rate, int channels, int bits, int codec, const char * server, int dir, const char * name) { 65 65 struct roar_stream s; 66 66 … … 70 70 } 71 71 72 int roar_simple_stream_obj (struct roar_stream * s, int rate, int channels, int bits, int codec, c har * server, int dir, char * name) {72 int roar_simple_stream_obj (struct roar_stream * s, int rate, int channels, int bits, int codec, const char * server, int dir, char * name) { 73 73 struct roar_connection con; 74 74 int ret; -
libroar/vio.c
r5109 r5114 409 409 410 410 int roar_vio_simple_stream (struct roar_vio_calls * calls, int rate, int channels, int bits, int codec, 411 c har * server, int dir,char * name) {411 const char * server, int dir, const char * name) { 412 412 int fh; 413 413 -
libroar/vs.c
r5111 r5114 301 301 _initerr(); 302 302 303 ret = roar_simple_connect(vss->con, (char*)server, (char*)name);303 ret = roar_simple_connect(vss->con, server, name); 304 304 305 305 if ( ret == -1 ) {
Note: See TracChangeset
for help on using the changeset viewer.