From: Jason Ish Date: Wed, 19 Mar 2025 21:00:38 +0000 (-0600) Subject: dns: stop renaming DNSTransaction to RSDNSTransaction X-Git-Tag: suricata-8.0.0-beta1~249 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7568b8020dc13a3d58f04ceb03cd553c6d761eb4;p=thirdparty%2Fsuricata.git dns: stop renaming DNSTransaction to RSDNSTransaction Not needed anymore as there is no DNSTransaction in the C src to conflict. --- diff --git a/rust/cbindgen.toml b/rust/cbindgen.toml index 7e20a8411a..6e9954990a 100644 --- a/rust/cbindgen.toml +++ b/rust/cbindgen.toml @@ -138,7 +138,6 @@ item_types = ["enums","structs","opaque","functions","constants"] # [export] # prefix = "capi_" [export.rename] -"DNSTransaction" = "RSDNSTransaction" "JsonT" = "json_t" "CLuaState" = "lua_State" diff --git a/rust/src/dns/dns.rs b/rust/src/dns/dns.rs index dc8b60411c..30ce44a9d8 100644 --- a/rust/src/dns/dns.rs +++ b/rust/src/dns/dns.rs @@ -1147,8 +1147,6 @@ pub unsafe extern "C" fn SCDnsTxGetAdditionalRdata( } /// Get the DNS response flags for a transaction. -/// -/// extern uint16_t SCDnsTxGetResponseFlags(RSDNSTransaction *); #[no_mangle] pub extern "C" fn SCDnsTxGetResponseFlags(tx: &mut DNSTransaction) -> u16 { return tx.rcode(); diff --git a/src/util-lua-dns.c b/src/util-lua-dns.c index 5bfa60166a..d6be01226d 100644 --- a/src/util-lua-dns.c +++ b/src/util-lua-dns.c @@ -32,7 +32,7 @@ static const char dns_tx[] = "suricata:dns:tx"; struct LuaTx { - RSDNSTransaction *tx; + DNSTransaction *tx; }; static int LuaDnsGetTx(lua_State *L) @@ -40,7 +40,7 @@ static int LuaDnsGetTx(lua_State *L) if (!(LuaStateNeedProto(L, ALPROTO_DNS))) { return LuaCallbackError(L, "error: protocol not dns"); } - RSDNSTransaction *tx = LuaStateGetTX(L); + DNSTransaction *tx = LuaStateGetTX(L); if (tx == NULL) { return LuaCallbackError(L, "error: no tx available"); }