Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-24 16:23:40 +01:00
Code Releases Activity

Support Erlang/OTP R15B driver (EJAB-1521)

Browse Source
This commit is contained in:
Badlop 2011-12-21 12:15:21 +01:00
parent 707bb0a321
commit 2029e39299
6 changed files with 155 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/ejabberd_zlib/ejabberd_zlib_drv.c
View File

@ -23,6 +23,15 @@
#include <erl_driver.h> #include <erl_driver.h>
#include <zlib.h> #include <zlib.h>
/*
* R15B changed several driver callbacks to use ErlDrvSizeT and
* ErlDrvSSizeT typedefs instead of int.
* This provides missing typedefs on older OTP versions.
*/
#if ERL_DRV_EXTENDED_MAJOR_VERSION < 2
typedef int ErlDrvSizeT;
typedef int ErlDrvSSizeT;
#endif
#define BUF_SIZE 1024 #define BUF_SIZE 1024
@ -98,10 +107,10 @@ static void ejabberd_zlib_drv_stop(ErlDrvData handle)
} }
static int ejabberd_zlib_drv_control(ErlDrvData handle, static ErlDrvSSizeT ejabberd_zlib_drv_control(ErlDrvData handle,
unsigned int command, unsigned int command,
char *buf, int len, char *buf, ErlDrvSizeT len,
char **rbuf, int rlen) char **rbuf, ErlDrvSizeT rlen)
{ {
ejabberd_zlib_data *d = (ejabberd_zlib_data *)handle; ejabberd_zlib_data *d = (ejabberd_zlib_data *)handle;
int err; int err;
@ -187,7 +196,19 @@ ErlDrvEntry ejabberd_zlib_driver_entry = {
NULL, /* handle */ NULL, /* handle */
ejabberd_zlib_drv_control, /* F_PTR control, port_command callback */ ejabberd_zlib_drv_control, /* F_PTR control, port_command callback */
NULL, /* F_PTR timeout, reserved */ NULL, /* F_PTR timeout, reserved */
NULL /* F_PTR outputv, reserved */ NULL, /* F_PTR outputv, reserved */
/* Added in Erlang/OTP R15B: */
NULL, /* ready_async */
NULL, /* flush */
NULL, /* call */
NULL, /* event */
ERL_DRV_EXTENDED_MARKER, /* extended_marker */
ERL_DRV_EXTENDED_MAJOR_VERSION, /* major_version */
ERL_DRV_EXTENDED_MINOR_VERSION, /* minor_version */
0, /* driver_flags */
NULL, /* handle2 */
NULL, /* process_exit */
NULL /* stop_select */
}; };
DRIVER_INIT(ejabberd_zlib_drv) /* must match name in driver_entry */ DRIVER_INIT(ejabberd_zlib_drv) /* must match name in driver_entry */

30
src/expat_erl.c
View File

@ -34,6 +34,16 @@
#define PARSE_COMMAND 0 #define PARSE_COMMAND 0
#define PARSE_FINAL_COMMAND 1 #define PARSE_FINAL_COMMAND 1
/*
* R15B changed several driver callbacks to use ErlDrvSizeT and
* ErlDrvSSizeT typedefs instead of int.
* This provides missing typedefs on older OTP versions.
*/
#if ERL_DRV_EXTENDED_MAJOR_VERSION < 2
typedef int ErlDrvSizeT;
typedef int ErlDrvSSizeT;
#endif
ei_x_buff event_buf; ei_x_buff event_buf;
ei_x_buff xmlns_buf; ei_x_buff xmlns_buf;
@ -190,10 +200,10 @@ static void expat_erl_stop(ErlDrvData handle)
driver_free((char*)handle); driver_free((char*)handle);
} }
static int expat_erl_control(ErlDrvData drv_data, static ErlDrvSSizeT expat_erl_control(ErlDrvData drv_data,
unsigned int command, unsigned int command,
char *buf, int len, char *buf, ErlDrvSizeT len,
char **rbuf, int rlen) char **rbuf, ErlDrvSizeT rlen)
{ {
expat_data* d = (expat_data*)drv_data; expat_data* d = (expat_data*)drv_data;
int res, errcode; int res, errcode;
@ -251,7 +261,19 @@ ErlDrvEntry expat_driver_entry = {
NULL, /* handle */ NULL, /* handle */
expat_erl_control, /* F_PTR control, port_command callback */ expat_erl_control, /* F_PTR control, port_command callback */
NULL, /* F_PTR timeout, reserved */ NULL, /* F_PTR timeout, reserved */
NULL /* F_PTR outputv, reserved */ NULL, /* F_PTR outputv, reserved */
/* Added in Erlang/OTP R15B: */
NULL, /* ready_async */
NULL, /* flush */
NULL, /* call */
NULL, /* event */
ERL_DRV_EXTENDED_MARKER, /* extended_marker */
ERL_DRV_EXTENDED_MAJOR_VERSION, /* major_version */
ERL_DRV_EXTENDED_MINOR_VERSION, /* minor_version */
0, /* driver_flags */
NULL, /* handle2 */
NULL, /* process_exit */
NULL /* stop_select */
}; };
DRIVER_INIT(expat_erl) /* must match name in driver_entry */ DRIVER_INIT(expat_erl) /* must match name in driver_entry */

30
src/mod_irc/iconv_erl.c
View File

@ -24,6 +24,16 @@
#include <ei.h> #include <ei.h>
#include <iconv.h> #include <iconv.h>
/*
* R15B changed several driver callbacks to use ErlDrvSizeT and
* ErlDrvSSizeT typedefs instead of int.
* This provides missing typedefs on older OTP versions.
*/
#if ERL_DRV_EXTENDED_MAJOR_VERSION < 2
typedef int ErlDrvSizeT;
typedef int ErlDrvSSizeT;
#endif
typedef struct { typedef struct {
ErlDrvPort port; ErlDrvPort port;
iconv_t cd; iconv_t cd;
@ -46,10 +56,10 @@ static void iconv_erl_stop(ErlDrvData handle)
driver_free((char*)handle); driver_free((char*)handle);
} }
static int iconv_erl_control(ErlDrvData drv_data, static ErlDrvSSizeT iconv_erl_control(ErlDrvData drv_data,
unsigned int command, unsigned int command,
char *buf, int len, char *buf, ErlDrvSizeT len,
char **rbuf, int rlen) char **rbuf, ErlDrvSizeT rlen)
{ {
int i; int i;
int size; int size;
@ -144,7 +154,19 @@ ErlDrvEntry iconv_driver_entry = {
NULL, /* handle */ NULL, /* handle */
iconv_erl_control, /* F_PTR control, port_command callback */ iconv_erl_control, /* F_PTR control, port_command callback */
NULL, /* F_PTR timeout, reserved */ NULL, /* F_PTR timeout, reserved */
NULL /* F_PTR outputv, reserved */ NULL, /* F_PTR outputv, reserved */
/* Added in Erlang/OTP R15B: */
NULL, /* ready_async */
NULL, /* flush */
NULL, /* call */
NULL, /* event */
ERL_DRV_EXTENDED_MARKER, /* extended_marker */
ERL_DRV_EXTENDED_MAJOR_VERSION, /* major_version */
ERL_DRV_EXTENDED_MINOR_VERSION, /* minor_version */
0, /* driver_flags */
NULL, /* handle2 */
NULL, /* process_exit */
NULL /* stop_select */
}; };
DRIVER_INIT(iconv_erl) /* must match name in driver_entry */ DRIVER_INIT(iconv_erl) /* must match name in driver_entry */

30
src/stringprep/stringprep_drv.c
View File

@ -30,6 +30,16 @@
#define NODEPREP_COMMAND 2 #define NODEPREP_COMMAND 2
#define RESOURCEPREP_COMMAND 3 #define RESOURCEPREP_COMMAND 3
/*
* R15B changed several driver callbacks to use ErlDrvSizeT and
* ErlDrvSSizeT typedefs instead of int.
* This provides missing typedefs on older OTP versions.
*/
#if ERL_DRV_EXTENDED_MAJOR_VERSION < 2
typedef int ErlDrvSizeT;
typedef int ErlDrvSSizeT;
#endif
typedef struct { typedef struct {
ErlDrvPort port; ErlDrvPort port;
} stringprep_data; } stringprep_data;
@ -194,10 +204,10 @@ static int compose(int ch1, int ch2)
static int stringprep_erl_control(ErlDrvData drv_data, static ErlDrvSSizeT stringprep_erl_control(ErlDrvData drv_data,
unsigned int command, unsigned int command,
char *buf, int len, char *buf, ErlDrvSizeT len,
char **rbuf, int rlen) char **rbuf, ErlDrvSizeT rlen)
{ {
int i, j, pos=1; int i, j, pos=1;
unsigned char c; unsigned char c;
@ -400,7 +410,19 @@ ErlDrvEntry stringprep_driver_entry = {
NULL, /* handle */ NULL, /* handle */
stringprep_erl_control, /* F_PTR control, port_command callback */ stringprep_erl_control, /* F_PTR control, port_command callback */
NULL, /* F_PTR timeout, reserved */ NULL, /* F_PTR timeout, reserved */
NULL /* F_PTR outputv, reserved */ NULL, /* F_PTR outputv, reserved */
/* Added in Erlang/OTP R15B: */
NULL, /* ready_async */
NULL, /* flush */
NULL, /* call */
NULL, /* event */
ERL_DRV_EXTENDED_MARKER, /* extended_marker */
ERL_DRV_EXTENDED_MAJOR_VERSION, /* major_version */
ERL_DRV_EXTENDED_MINOR_VERSION, /* minor_version */
0, /* driver_flags */
NULL, /* handle2 */
NULL, /* process_exit */
NULL /* stop_select */
}; };
DRIVER_INIT(stringprep_erl) /* must match name in driver_entry */ DRIVER_INIT(stringprep_erl) /* must match name in driver_entry */

30
src/tls/sha_drv.c
View File

@ -24,16 +24,26 @@
#include <openssl/md2.h> #include <openssl/md2.h>
#endif #endif
/*
* R15B changed several driver callbacks to use ErlDrvSizeT and
* ErlDrvSSizeT typedefs instead of int.
* This provides missing typedefs on older OTP versions.
*/
#if ERL_DRV_EXTENDED_MAJOR_VERSION < 2
typedef int ErlDrvSizeT;
typedef int ErlDrvSSizeT;
#endif
static ErlDrvData sha_drv_start(ErlDrvPort port, char *buf) static ErlDrvData sha_drv_start(ErlDrvPort port, char *buf)
{ {
set_port_control_flags(port, PORT_CONTROL_FLAG_BINARY); set_port_control_flags(port, PORT_CONTROL_FLAG_BINARY);
return NULL; return NULL;
} }
static int sha_drv_control(ErlDrvData handle, static ErlDrvSSizeT sha_drv_control(ErlDrvData handle,
unsigned int command, unsigned int command,
char *buf, int len, char *buf, ErlDrvSizeT len,
char **rbuf, int rlen) char **rbuf, ErlDrvSizeT rlen)
{ {
ErlDrvBinary *b = NULL; ErlDrvBinary *b = NULL;
@ -89,7 +99,19 @@ ErlDrvEntry sha_driver_entry = {
NULL, /* handle */ NULL, /* handle */
sha_drv_control, /* F_PTR control, port_command callback */ sha_drv_control, /* F_PTR control, port_command callback */
NULL, /* F_PTR timeout, reserved */ NULL, /* F_PTR timeout, reserved */
NULL /* F_PTR outputv, reserved */ NULL, /* F_PTR outputv, reserved */
/* Added in Erlang/OTP R15B: */
NULL, /* ready_async */
NULL, /* flush */
NULL, /* call */
NULL, /* event */
ERL_DRV_EXTENDED_MARKER, /* extended_marker */
ERL_DRV_EXTENDED_MAJOR_VERSION, /* major_version */
ERL_DRV_EXTENDED_MINOR_VERSION, /* minor_version */
0, /* driver_flags */
NULL, /* handle2 */
NULL, /* process_exit */
NULL /* stop_select */
}; };
DRIVER_INIT(sha_drv) /* must match name in driver_entry */ DRIVER_INIT(sha_drv) /* must match name in driver_entry */

30
src/tls/tls_drv.c
View File

@ -44,6 +44,16 @@ typedef unsigned __int32 uint32_t;
#define SSL_OP_NO_TICKET 0 #define SSL_OP_NO_TICKET 0
#endif #endif
/*
* R15B changed several driver callbacks to use ErlDrvSizeT and
* ErlDrvSSizeT typedefs instead of int.
* This provides missing typedefs on older OTP versions.
*/
#if ERL_DRV_EXTENDED_MAJOR_VERSION < 2
typedef int ErlDrvSizeT;
typedef int ErlDrvSSizeT;
#endif
/* /*
* str_hash is based on the public domain code from * str_hash is based on the public domain code from
* http://www.burtleburtle.net/bob/hash/doobs.html * http://www.burtleburtle.net/bob/hash/doobs.html
@ -305,10 +315,10 @@ static int verify_callback(int preverify_ok, X509_STORE_CTX *ctx)
} }
static int tls_drv_control(ErlDrvData handle, static ErlDrvSSizeT tls_drv_control(ErlDrvData handle,
unsigned int command, unsigned int command,
char *buf, int len, char *buf, ErlDrvSizeT len,
char **rbuf, int rlen) char **rbuf, ErlDrvSizeT rlen)
{ {
tls_data *d = (tls_data *)handle; tls_data *d = (tls_data *)handle;
int res; int res;
@ -503,7 +513,19 @@ ErlDrvEntry tls_driver_entry = {
NULL, /* handle */ NULL, /* handle */
tls_drv_control, /* F_PTR control, port_command callback */ tls_drv_control, /* F_PTR control, port_command callback */
NULL, /* F_PTR timeout, reserved */ NULL, /* F_PTR timeout, reserved */
NULL /* F_PTR outputv, reserved */ NULL, /* F_PTR outputv, reserved */
/* Added in Erlang/OTP R15B: */
NULL, /* ready_async */
NULL, /* flush */
NULL, /* call */
NULL, /* event */
ERL_DRV_EXTENDED_MARKER, /* extended_marker */
ERL_DRV_EXTENDED_MAJOR_VERSION, /* major_version */
ERL_DRV_EXTENDED_MINOR_VERSION, /* minor_version */
0, /* driver_flags */
NULL, /* handle2 */
NULL, /* process_exit */
NULL /* stop_select */
}; };
DRIVER_INIT(tls_drv) /* must match name in driver_entry */ DRIVER_INIT(tls_drv) /* must match name in driver_entry */