Changeset 81:d4aa20e568c9 in roaraudio


Ignore:
Timestamp:
07/12/08 18:16:25 (16 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

added roar_stream_connect_to() to libroar

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • include/libroar/socket.h

    r75 r81  
    55 
    66#include "libroar.h" 
     7 
     8#define ROAR_SOCKET_MODE_LISTEN  1 
     9#define ROAR_SOCKET_MODE_CONNECT 2 
    710 
    811#define ROAR_SOCKET_TYPE_NONE 0 
     
    1316#define ROAR_SOCKET_TYPE_PIPE ROAR_SOCKET_TYPE_FORK 
    1417#define ROAR_SOCKET_TYPE_FILE 4 
     18 
     19#define ROAR_SOCKET_TYPE_MAX  4 
    1520 
    1621#define ROAR_SOCKET_QUEUE_LEN 8 
  • include/libroar/stream.h

    r0 r81  
    1818 
    1919int roar_stream_exec    (struct roar_connection * con, struct roar_stream * s); 
     20int roar_stream_connect_to (struct roar_connection * con, struct roar_stream * s, int type, char * host, int port); 
    2021 
    2122int roar_stream_add_data (struct roar_connection * con, struct roar_stream * s, char * data, size_t len); 
  • libroar/socket.c

    r75 r81  
    33#include "libroar.h" 
    44 
     5/* old... 
    56#define MODE_LISTEN  1 
    67#define MODE_CONNECT 2 
     8*/ 
     9#define MODE_LISTEN  ROAR_SOCKET_MODE_LISTEN 
     10#define MODE_CONNECT ROAR_SOCKET_MODE_CONNECT 
    711 
    812int roar_socket_new_tcp (void) { 
  • libroar/stream.c

    r0 r81  
    7373} 
    7474 
     75int roar_stream_connect_to (struct roar_connection * con, struct roar_stream * s, int type, char * host, int port) { 
     76 struct roar_message m; 
     77 int len = 0; 
     78 
     79 if ( host == NULL ) 
     80  return -1; 
     81 
     82 m.cmd     = ROAR_CMD_CON_STREAM; 
     83 m.stream  = s->id; 
     84 m.pos     = 0; 
     85 
     86 m.data[0] = 0; 
     87 m.data[1] = type; 
     88 ((uint16_t*)&(m.data))[1] = ROAR_HOST2NET16(port); 
     89 
     90 len = strlen(host); 
     91 
     92 if ( len > 76 ) 
     93  return -1; 
     94 
     95 strncpy(&(m.data[4]), host, len); 
     96 
     97 m.datalen = len + 4; 
     98 
     99 if ( roar_req(con, &m, NULL) == -1 ) 
     100  return -1; 
     101 
     102 if ( m.cmd == ROAR_CMD_OK ) 
     103  return 0; 
     104 return -1; 
     105} 
    75106 
    76107int roar_stream_add_data (struct roar_connection * con, struct roar_stream * s, char * data, size_t len) { 
Note: See TracChangeset for help on using the changeset viewer.