Changeset 1319:acdd2e21951b in roaraudio for libroar/basic.c
- Timestamp:
- 03/21/09 04:01:57 (15 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
libroar/basic.c
r1315 r1319 247 247 #define _ROAR_MESS_BUF_LEN (1 /* version */ + 1 /* cmd */ + 2 /* stream */ + 4 /* pos */ + 2 /* datalen */) 248 248 int roar_send_message (struct roar_connection * con, struct roar_message * mes, char * data) { 249 struct roar_vio_calls vio; 250 251 if ( roar_vio_open_fh_socket(&vio, con->fh) == -1 ) 252 return -1; 253 254 return roar_vsend_message(&vio, mes, data); 255 } 256 257 int roar_vsend_message(struct roar_vio_calls * vio, struct roar_message * mes, char * data) { 249 258 char buf[_ROAR_MESS_BUF_LEN]; 250 259 … … 259 268 *(uint16_t*)(buf+8) = ROAR_HOST2NET16(mes->datalen); 260 269 261 if ( ROAR_NETWORK_WRITE(con->fh, buf, _ROAR_MESS_BUF_LEN) != _ROAR_MESS_BUF_LEN ) {270 if ( roar_vio_write(vio, buf, _ROAR_MESS_BUF_LEN) != _ROAR_MESS_BUF_LEN ) { 262 271 roar_errno = ROAR_ERROR_PIPE; 263 272 return -1; … … 265 274 266 275 if ( mes->datalen != 0 ) { 267 if ( ROAR_NETWORK_WRITE(con->fh, data == NULL ? mes->data : data, mes->datalen) != mes->datalen ) {276 if ( roar_vio_write(vio, data == NULL ? mes->data : data, mes->datalen) != mes->datalen ) { 268 277 roar_errno = ROAR_ERROR_PIPE; 269 278 return -1; … … 278 287 279 288 int roar_recv_message (struct roar_connection * con, struct roar_message * mes, char ** data) { 289 struct roar_vio_calls vio; 290 291 if ( roar_vio_open_fh_socket(&vio, con->fh) == -1 ) 292 return -1; 293 294 return roar_vrecv_message(&vio, mes, data); 295 } 296 297 int roar_vrecv_message(struct roar_vio_calls * vio, struct roar_message * mes, char ** data) { 280 298 char buf[_ROAR_MESS_BUF_LEN]; 281 299 … … 287 305 *data = NULL; 288 306 289 if ( ROAR_NETWORK_READ(con->fh, buf, _ROAR_MESS_BUF_LEN) != _ROAR_MESS_BUF_LEN ) {307 if ( roar_vio_read(vio, buf, _ROAR_MESS_BUF_LEN) != _ROAR_MESS_BUF_LEN ) { 290 308 roar_errno = ROAR_ERROR_PROTO; 291 309 return -1; … … 315 333 316 334 if ( mes->datalen <= LIBROAR_BUFFER_MSGDATA ) { 317 if ( ROAR_NETWORK_READ(con->fh, mes->data, mes->datalen) == mes->datalen ) {335 if ( roar_vio_read(vio, mes->data, mes->datalen) == mes->datalen ) { 318 336 ROAR_DBG("roar_recv_message(*): Got data!"); 319 337 ROAR_DBG("roar_recv_message(*) = 0"); … … 340 358 } 341 359 342 if ( ROAR_NETWORK_READ(con->fh, *data, mes->datalen) == mes->datalen ) {360 if ( roar_vio_read(vio, *data, mes->datalen) == mes->datalen ) { 343 361 ROAR_DBG("roar_recv_message(*): Got data!"); 344 362 ROAR_DBG("roar_recv_message(*) = 0"); … … 356 374 357 375 int roar_req (struct roar_connection * con, struct roar_message * mes, char ** data) { 358 if ( roar_send_message(con, mes, data ? *data : NULL) != 0 ) 376 struct roar_vio_calls vio; 377 378 if ( roar_vio_open_fh_socket(&vio, con->fh) == -1 ) 379 return -1; 380 381 return roar_vreq(&vio, mes, data); 382 } 383 384 int roar_vreq (struct roar_vio_calls * vio, struct roar_message * mes, char ** data) { 385 if ( roar_vsend_message(vio, mes, data ? *data : NULL) != 0 ) 359 386 return -1; 360 387 … … 362 389 free(*data); 363 390 364 return roar_ recv_message(con, mes, data);391 return roar_vrecv_message(vio, mes, data); 365 392 } 366 393
Note: See TracChangeset
for help on using the changeset viewer.