Changeset 5617:df74a3973acb in roaraudio


Ignore:
Timestamp:
08/08/12 16:43:41 (12 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

Converted roard's protocol-irc plugin to CPI (Closes: #295)

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    r5615 r5617  
    22        * Fixed pa_xfree() (Closes: #293) 
    33        * Allow passing of extra parameters to cdrivers (Closes: #290) 
     4        * Converted roard's protocol-irc plugin to CPI (Closes: #295) 
    45 
    56v. 1.0beta4 - Mon Aug 06 2012 16:43 CEST 
  • plugins/roard/protocol-irc.c

    r5451 r5617  
    444444} 
    445445 
    446 static int new_client(int client, struct roar_vio_calls * vio, struct roard_listen * lsock) { 
     446static int set_proto(int client, struct roar_vio_calls * vio, struct roar_buffer ** obuffer, void ** userdata, const struct roar_keyval * protopara, ssize_t protoparalen, struct roar_dl_librarypara * pluginpara) { 
    447447 struct roar_client_server * cs; 
    448448 char * name; 
    449449 
    450  (void)client, (void)vio, (void)lsock; 
     450 (void)client, (void)vio, (void)obuffer, (void)userdata, (void)protopara, (void)protoparalen, (void)pluginpara; 
    451451 
    452452 clients_get_server(client, &cs); 
     
    485485} 
    486486 
    487 static int check_client(int client, struct roar_vio_calls * vio) { 
    488  struct roar_vio_calls     rvio; 
     487static int check_client(int client, struct roar_vio_calls * vio, struct roar_buffer ** obuffer, void ** userdata, const struct roar_keyval * protopara, ssize_t protoparalen, struct roar_dl_librarypara * pluginpara) { 
    489488 char cmd[1024*2]; 
    490489 char * args; 
     
    494493 int found = 0; 
    495494 
    496  if ( vio == NULL ) { 
    497   vio = &rvio; 
    498   roar_vio_open_fh_socket(vio, clients_get_fh(client)); 
    499  } 
     495 (void)obuffer, (void)userdata, (void)protopara, (void)protoparalen, (void)pluginpara; 
    500496 
    501497 len = roar_vio_read(vio, cmd, sizeof(cmd)-1); 
     
    867863} 
    868864 
    869 static struct roard_proto proto[1] = { 
    870  {ROAR_PROTO_IRC, ROAR_SUBSYS_NONE, "Internet Relay Chat", NULL, new_client, NULL, check_client, NULL, NULL} 
     865static const struct roar_dl_proto proto = { 
     866 .proto = ROAR_PROTO_IRC, 
     867 .description = "Internet Relay Chat", 
     868 .flags = ROAR_DL_PROTO_FLAGS_NONE, 
     869 .set_proto = set_proto, 
     870 .unset_proto = NULL, 
     871 .handle = check_client, 
     872 .flush = NULL, 
     873 .flushed = NULL, 
     874 .status = NULL 
    871875}; 
    872876 
    873 ROARD_DL_REG_PROTO(proto) 
     877static int __reg_proto(struct roar_dl_librarypara * para, struct roar_dl_libraryinst * lib) { 
     878 (void)para, (void)lib; 
     879 ROAR_DL_PLUGIN_REG_FN(ROAR_DL_PROTO_SUBTYPE, proto, ROAR_DL_PROTO_VERSION); 
     880 return 0; 
     881} 
    874882 
    875883ROAR_DL_PLUGIN_START(protocol_irc) { 
     
    884892 ROAR_DL_PLUGIN_REG(ROAR_DL_FN_INIT, init); 
    885893 ROAR_DL_PLUGIN_REG_UNLOAD(unload); 
    886  ROARD_DL_REGFN_PROTO(); 
     894 ROAR_DL_PLUGIN_REG(ROAR_DL_FN_PROTO, __reg_proto); 
    887895} ROAR_DL_PLUGIN_END 
    888896 
Note: See TracChangeset for help on using the changeset viewer.