From: Alan T. DeKok Date: Sun, 12 Mar 2023 01:49:03 +0000 (-0500) Subject: remove unnecessary checks for app_io decoder X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc50e8b07c754985182357536dae38ef9f1a617a;p=thirdparty%2Ffreeradius-server.git remove unnecessary checks for app_io decoder --- diff --git a/src/listen/bfd/proto_bfd.c b/src/listen/bfd/proto_bfd.c index 4ddc6847754..1831c6ed733 100644 --- a/src/listen/bfd/proto_bfd.c +++ b/src/listen/bfd/proto_bfd.c @@ -175,9 +175,8 @@ static int auth_type_parse(UNUSED TALLOC_CTX *ctx, void *out, UNUSED void *paren /** Decode the packet * */ -static int mod_decode(void const *instance, request_t *request, uint8_t *const data, size_t data_len) +static int mod_decode(UNUSED void const *instance, request_t *request, uint8_t *const data, size_t data_len) { - proto_bfd_t const *inst = talloc_get_type_abort_const(instance, proto_bfd_t); fr_io_track_t const *track = talloc_get_type_abort_const(request->async->packet_ctx, fr_io_track_t); fr_io_address_t const *address = track->address; fr_client_t const *client; @@ -282,12 +281,7 @@ static int mod_decode(void const *instance, request_t *request, uint8_t *const d } } - if (!inst->io.app_io->decode) return 0; - - /* - * Let the app_io do anything it needs to do. - */ - return inst->io.app_io->decode(inst->io.app_io_instance, request, data, data_len); + return 0; } static ssize_t mod_encode(UNUSED void const *instance, request_t *request, uint8_t *buffer, size_t buffer_len) diff --git a/src/listen/dhcpv4/proto_dhcpv4.c b/src/listen/dhcpv4/proto_dhcpv4.c index f112bcae071..2436d7dc9ea 100644 --- a/src/listen/dhcpv4/proto_dhcpv4.c +++ b/src/listen/dhcpv4/proto_dhcpv4.c @@ -190,9 +190,8 @@ static int transport_parse(TALLOC_CTX *ctx, void *out, UNUSED void *parent, /** Decode the packet * */ -static int mod_decode(void const *instance, request_t *request, uint8_t *const data, size_t data_len) +static int mod_decode(UNUSED void const *instance, request_t *request, uint8_t *const data, size_t data_len) { - proto_dhcpv4_t const *inst = talloc_get_type_abort_const(instance, proto_dhcpv4_t); fr_io_track_t const *track = talloc_get_type_abort_const(request->async->packet_ctx, fr_io_track_t); fr_io_address_t const *address = track->address; fr_client_t const *client; @@ -240,12 +239,7 @@ static int mod_decode(void const *instance, request_t *request, uint8_t *const d REQUEST_VERIFY(request); - if (!inst->io.app_io->decode) return 0; - - /* - * Let the app_io do anything it needs to do. - */ - return inst->io.app_io->decode(inst->io.app_io_instance, request, data, data_len); + return 0; } static ssize_t mod_encode(UNUSED void const *instance, request_t *request, uint8_t *buffer, size_t buffer_len) diff --git a/src/listen/dhcpv6/proto_dhcpv6.c b/src/listen/dhcpv6/proto_dhcpv6.c index 21117a6262d..608596081f3 100644 --- a/src/listen/dhcpv6/proto_dhcpv6.c +++ b/src/listen/dhcpv6/proto_dhcpv6.c @@ -190,9 +190,8 @@ static int transport_parse(TALLOC_CTX *ctx, void *out, UNUSED void *parent, /** Decode the packet * */ -static int mod_decode(void const *instance, request_t *request, uint8_t *const data, size_t data_len) +static int mod_decode(UNUSED void const *instance, request_t *request, uint8_t *const data, size_t data_len) { - proto_dhcpv6_t const *inst = talloc_get_type_abort_const(instance, proto_dhcpv6_t); fr_io_track_t const *track = talloc_get_type_abort_const(request->async->packet_ctx, fr_io_track_t); fr_io_address_t const *address = track->address; fr_client_t const *client; @@ -239,12 +238,7 @@ static int mod_decode(void const *instance, request_t *request, uint8_t *const d REQUEST_VERIFY(request); - if (!inst->io.app_io->decode) return 0; - - /* - * Let the app_io do anything it needs to do. - */ - return inst->io.app_io->decode(inst->io.app_io_instance, request, data, data_len); + return 0; } static ssize_t mod_encode(UNUSED void const *instance, request_t *request, uint8_t *buffer, size_t buffer_len) diff --git a/src/listen/dns/proto_dns.c b/src/listen/dns/proto_dns.c index 2763c18edd0..b2784f499f5 100644 --- a/src/listen/dns/proto_dns.c +++ b/src/listen/dns/proto_dns.c @@ -171,9 +171,8 @@ static int transport_parse(TALLOC_CTX *ctx, void *out, UNUSED void *parent, /** Decode the packet * */ -static int mod_decode(void const *instance, request_t *request, uint8_t *const data, size_t data_len) +static int mod_decode(UNUSED void const *instance, request_t *request, uint8_t *const data, size_t data_len) { - proto_dns_t const *inst = talloc_get_type_abort_const(instance, proto_dns_t); fr_io_track_t const *track = talloc_get_type_abort_const(request->async->packet_ctx, fr_io_track_t); fr_io_address_t const *address = track->address; fr_client_t const *client; @@ -230,12 +229,7 @@ static int mod_decode(void const *instance, request_t *request, uint8_t *const d REQUEST_VERIFY(request); - if (!inst->io.app_io->decode) return 0; - - /* - * Let the app_io do anything it needs to do. - */ - return inst->io.app_io->decode(inst->io.app_io_instance, request, data, data_len); + return 0; } static ssize_t mod_encode(UNUSED void const *instance, request_t *request, uint8_t *buffer, size_t buffer_len) diff --git a/src/listen/radius/proto_radius.c b/src/listen/radius/proto_radius.c index e12283ece78..1916bc857d3 100644 --- a/src/listen/radius/proto_radius.c +++ b/src/listen/radius/proto_radius.c @@ -197,9 +197,8 @@ static int transport_parse(TALLOC_CTX *ctx, void *out, UNUSED void *parent, CONF /** Decode the packet * */ -static int mod_decode(void const *instance, request_t *request, uint8_t *const data, size_t data_len) +static int mod_decode(UNUSED void const *instance, request_t *request, uint8_t *const data, size_t data_len) { - proto_radius_t const *inst = talloc_get_type_abort_const(instance, proto_radius_t); fr_io_track_t const *track = talloc_get_type_abort_const(request->async->packet_ctx, fr_io_track_t); fr_io_address_t const *address = track->address; fr_client_t const *client; @@ -306,12 +305,7 @@ static int mod_decode(void const *instance, request_t *request, uint8_t *const d request->async->sequence = 1; } - if (!inst->io.app_io->decode) return 0; - - /* - * Let the app_io do anything it needs to do. - */ - return inst->io.app_io->decode(inst->io.app_io_instance, request, data, data_len); + return 0; } static ssize_t mod_encode(UNUSED void const *instance, request_t *request, uint8_t *buffer, size_t buffer_len) diff --git a/src/listen/tacacs/proto_tacacs.c b/src/listen/tacacs/proto_tacacs.c index be02c105e1a..5a393a19fe7 100644 --- a/src/listen/tacacs/proto_tacacs.c +++ b/src/listen/tacacs/proto_tacacs.c @@ -185,9 +185,8 @@ static int transport_parse(TALLOC_CTX *ctx, void *out, UNUSED void *parent, CONF /** Decode the packet * */ -static int mod_decode(void const *instance, request_t *request, uint8_t *const data, size_t data_len) +static int mod_decode(UNUSED void const *instance, request_t *request, uint8_t *const data, size_t data_len) { - proto_tacacs_t const *inst = talloc_get_type_abort_const(instance, proto_tacacs_t); fr_io_track_t const *track = talloc_get_type_abort_const(request->async->packet_ctx, fr_io_track_t); fr_io_address_t const *address = track->address; fr_client_t const *client; @@ -343,12 +342,7 @@ static int mod_decode(void const *instance, request_t *request, uint8_t *const d } } - if (!inst->io.app_io->decode) return 0; - - /* - * Let the app_io do anything it needs to do. - */ - return inst->io.app_io->decode(inst->io.app_io_instance, request, data, data_len); + return 0; } static ssize_t mod_encode(UNUSED void const *instance, request_t *request, uint8_t *buffer, size_t buffer_len) diff --git a/src/listen/vmps/proto_vmps.c b/src/listen/vmps/proto_vmps.c index 7a931b0a50b..77d253b6c69 100644 --- a/src/listen/vmps/proto_vmps.c +++ b/src/listen/vmps/proto_vmps.c @@ -178,9 +178,8 @@ static int transport_parse(TALLOC_CTX *ctx, void *out, UNUSED void *parent, /** Decode the packet * */ -static int mod_decode(void const *instance, request_t *request, uint8_t *const data, size_t data_len) +static int mod_decode(UNUSED void const *instance, request_t *request, uint8_t *const data, size_t data_len) { - proto_vmps_t const *inst = talloc_get_type_abort_const(instance, proto_vmps_t); fr_io_track_t const *track = talloc_get_type_abort_const(request->async->packet_ctx, fr_io_track_t); fr_io_address_t const *address = track->address; fr_client_t const *client; @@ -231,12 +230,7 @@ static int mod_decode(void const *instance, request_t *request, uint8_t *const d REQUEST_VERIFY(request); - if (!inst->io.app_io->decode) return 0; - - /* - * Let the app_io do anything it needs to do. - */ - return inst->io.app_io->decode(inst->io.app_io_instance, request, data, data_len); + return 0; } static ssize_t mod_encode(UNUSED void const *instance, request_t *request, uint8_t *buffer, size_t buffer_len)