diff options
Diffstat (limited to 'lib/megaco/src')
| -rw-r--r-- | lib/megaco/src/app/megaco.appup.src | 21 | ||||
| -rw-r--r-- | lib/megaco/src/flex/megaco_flex_scanner_drv.flex.src | 37 |
2 files changed, 22 insertions, 36 deletions
diff --git a/lib/megaco/src/app/megaco.appup.src b/lib/megaco/src/app/megaco.appup.src index 7f6fe0c733..3c9740818a 100644 --- a/lib/megaco/src/app/megaco.appup.src +++ b/lib/megaco/src/app/megaco.appup.src @@ -141,48 +141,41 @@ %% 3.15.1.1 %% | %% v -%% 3.15.1.2 +%% 3.16 %% %% {"%VSN%", [ {"3.15.1.1", [ + {restart_application, megaco} ] }, {"3.15.1", [ + {restart_application, megaco} ] }, {"3.15", [ - {load_module, megaco_flex_scanner, soft_purge, soft_purge, []}, - {load_module, megaco_sdp, soft_purge, soft_purge, []}, - {load_module, megaco_filter, soft_purge, soft_purge, []}, - {load_module, megaco_timer, soft_purge, soft_purge, [megaco_config_misc]}, - {update, megaco_config, soft, soft_purge, soft_purge, - [megaco_timer, megaco_config_misc]}, - {add_module, megaco_config_misc} + {restart_application, megaco} ] } ], [ {"3.15.1.1", [ + {restart_application, megaco} ] }, {"3.15.1", [ + {restart_application, megaco} ] }, {"3.15", [ - {load_module, megaco_flex_scanner, soft_purge, soft_purge, []}, - {load_module, megaco_sdp, soft_purge, soft_purge, []}, - {load_module, megaco_filter, soft_purge, soft_purge, []}, - {load_module, megaco_timer, soft_purge, soft_purge, [megaco_config]}, - {update, megaco_config, soft, soft_purge, soft_purge, []}, - {remove, {megaco_config_misc, soft_purge, brutal_purge}} + {restart_application, megaco} ] } ] diff --git a/lib/megaco/src/flex/megaco_flex_scanner_drv.flex.src b/lib/megaco/src/flex/megaco_flex_scanner_drv.flex.src index 9b4f717201..26991d3412 100644 --- a/lib/megaco/src/flex/megaco_flex_scanner_drv.flex.src +++ b/lib/megaco/src/flex/megaco_flex_scanner_drv.flex.src @@ -60,18 +60,11 @@ #define NUL 0x0 #if defined(MEGACO_REENTRANT_FLEX_SCANNER) - #define MEGACO_EXTENDED_MARKER ERL_DRV_EXTENDED_MARKER - #define MEGACO_DRIVER_FLAGS ERL_DRV_FLAG_USE_PORT_LOCKING - #define MEGACO_EXTENDED_MAJOR_VERSION ERL_DRV_EXTENDED_MAJOR_VERSION - #define MEGACO_EXTENDED_MINOR_VERSION ERL_DRV_EXTENDED_MINOR_VERSION -#else - #define MEGACO_EXTENDED_MARKER 0 - #define MEGACO_DRIVER_FLAGS 0 - #define MEGACO_EXTENDED_MAJOR_VERSION 0 - #define MEGACO_EXTENDED_MINOR_VERSION 0 +# define MEGACO_DRIVER_FLAGS ERL_DRV_FLAG_USE_PORT_LOCKING +#else +# define MEGACO_DRIVER_FLAGS 0 #endif - #define FREE(bufP) driver_free(bufP) #define ALLOC(sz) driver_alloc(sz) #define REALLOC(bufP, sz) driver_realloc(bufP, sz) @@ -320,11 +313,11 @@ static void mfs_load_map_token(); static ErlDrvData mfs_start(ErlDrvPort port, char *buf); static void mfs_stop(ErlDrvData handle); static void mfs_command(ErlDrvData handle, - char *buf, int buf_len); -static int mfs_control(ErlDrvData handle, + char *buf, ErlDrvSizeT buf_len); +static ErlDrvSSizeT mfs_control(ErlDrvData handle, unsigned int command, - char *buf, int buf_len, - char **res_buf, int res_buf_len); + char *buf, ErlDrvSizeT buf_len, + char **res_buf, ErlDrvSizeT res_buf_len); static void mfs_finish(void); /* @@ -348,10 +341,10 @@ static ErlDrvEntry mfs_entry = { NULL, /* flush, port is about to be closed */ NULL, /* call, a syncronous call into the driver */ NULL, /* event, event selected by driver_event() has occurred */ - MEGACO_EXTENDED_MARKER, /* extended_marker, which we use if reentrant */ - MEGACO_EXTENDED_MAJOR_VERSION, /* major_version, ... */ - MEGACO_EXTENDED_MINOR_VERSION, /* minor_version, ... */ - MEGACO_DRIVER_FLAGS, /* driver_flags, used for port lock indication */ + ERL_DRV_EXTENDED_MARKER, + ERL_DRV_EXTENDED_MAJOR_VERSION, + ERL_DRV_EXTENDED_MINOR_VERSION, + MEGACO_DRIVER_FLAGS, /* driver_flags, used for port lock indication */ NULL, /* handle2, emulator internal use */ NULL /* process_exit, Called when a process monitor fires */ }; @@ -1685,17 +1678,17 @@ static void mfs_stop(ErlDrvData handle) } static void mfs_command(ErlDrvData handle, - char *buf, int buf_len) + char *buf, ErlDrvSizeT buf_len) { driver_failure_atom(((MfsErlDrvData*) handle)->port, "bad_usage"); return; } -static int mfs_control(ErlDrvData handle, +static ErlDrvSSizeT mfs_control(ErlDrvData handle, unsigned int command, - char *buf, int buf_len, - char **res_buf, int res_buf_len) + char *buf, ErlDrvSizeT buf_len, + char **res_buf, ErlDrvSizeT res_buf_len) { MfsErlDrvData* dataP = (MfsErlDrvData*) handle; char* tmp; |