From: Alan T. DeKok Date: Sun, 27 Aug 2017 20:57:48 +0000 (-0400) Subject: make write() take non-const 'inst' X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b44fbdaae49e6f2e39242d7bc0ca69d0884a52f7;p=thirdparty%2Ffreeradius-server.git make write() take non-const 'inst' --- diff --git a/src/lib/io/io.h b/src/lib/io/io.h index fa3abd80b77..723c252c4a0 100644 --- a/src/lib/io/io.h +++ b/src/lib/io/io.h @@ -213,7 +213,7 @@ typedef ssize_t (*fr_io_data_read_t)(void const *instance, void **packet_ctx, fr * - <0 on error * - >=0 length of the data read or written. */ -typedef ssize_t (*fr_io_data_write_t)(void const *instance, void *packet_ctx, fr_time_t request_time, +typedef ssize_t (*fr_io_data_write_t)(void *instance, void *packet_ctx, fr_time_t request_time, uint8_t *buffer, size_t buffer_len); /** Handle a close or error on the socket. diff --git a/src/modules/proto_radius/proto_radius_udp.c b/src/modules/proto_radius/proto_radius_udp.c index 40c85e51b51..f2f290404c7 100644 --- a/src/modules/proto_radius/proto_radius_udp.c +++ b/src/modules/proto_radius/proto_radius_udp.c @@ -317,10 +317,10 @@ static ssize_t mod_read(void const *instance, void **packet_ctx, fr_time_t **rec return packet_len; } -static ssize_t mod_write(void const *instance, void *packet_ctx, +static ssize_t mod_write(void *instance, void *packet_ctx, fr_time_t request_time, uint8_t *buffer, size_t buffer_len) { - proto_radius_udp_t const *inst = talloc_get_type_abort(instance, proto_radius_udp_t); + proto_radius_udp_t *inst = talloc_get_type_abort(instance, proto_radius_udp_t); fr_tracking_entry_t *track = packet_ctx; proto_radius_udp_address_t *address = track->src_dst; diff --git a/src/modules/proto_vmps/proto_vmps_udp.c b/src/modules/proto_vmps/proto_vmps_udp.c index 368b1363a11..425c6740955 100644 --- a/src/modules/proto_vmps/proto_vmps_udp.c +++ b/src/modules/proto_vmps/proto_vmps_udp.c @@ -178,10 +178,10 @@ static ssize_t mod_read(void const *instance, void **packet_ctx, fr_time_t **rec return packet_len + sizeof(*ip); } -static ssize_t mod_write(void const *instance, void *packet_ctx, +static ssize_t mod_write(void *instance, void *packet_ctx, UNUSED fr_time_t request_time, uint8_t *buffer, size_t buffer_len) { - proto_vmps_udp_t const *inst = talloc_get_type_abort(instance, proto_vmps_udp_t); + proto_vmps_udp_t *inst = talloc_get_type_abort(instance, proto_vmps_udp_t); fr_ip_srcdst_t *ip = packet_ctx; uint8_t *packet; size_t packet_len; diff --git a/src/tests/util/radius_schedule_test.c b/src/tests/util/radius_schedule_test.c index f1cadadb11c..6886de51bdb 100644 --- a/src/tests/util/radius_schedule_test.c +++ b/src/tests/util/radius_schedule_test.c @@ -157,7 +157,7 @@ static ssize_t test_read(void const *ctx, UNUSED void **packet_ctx, fr_time_t ** } -static ssize_t test_write(void const *ctx, UNUSED void *packet_ctx, UNUSED fr_time_t request_time, +static ssize_t test_write(void *ctx, UNUSED void *packet_ctx, UNUSED fr_time_t request_time, uint8_t *buffer, size_t buffer_len) { ssize_t data_size;