From: Victor Julien Date: Sat, 6 May 2023 06:01:03 +0000 (+0200) Subject: detect: spelling: multi-tenancy fixes X-Git-Tag: suricata-7.0.0-rc2~262 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bbcf6fe76b3812a8c792afd6446860c149029c44;p=thirdparty%2Fsuricata.git detect: spelling: multi-tenancy fixes --- diff --git a/src/detect-engine.c b/src/detect-engine.c index db1bd3b842..cce664e6af 100644 --- a/src/detect-engine.c +++ b/src/detect-engine.c @@ -98,9 +98,9 @@ static DetectEngineMasterCtx g_master_de_ctx = { SCMUTEX_INITIALIZER, static uint32_t TenantIdHash(HashTable *h, void *data, uint16_t data_len); static char TenantIdCompare(void *d1, uint16_t d1_len, void *d2, uint16_t d2_len); static void TenantIdFree(void *d); -static uint32_t DetectEngineTentantGetIdFromLivedev(const void *ctx, const Packet *p); -static uint32_t DetectEngineTentantGetIdFromVlanId(const void *ctx, const Packet *p); -static uint32_t DetectEngineTentantGetIdFromPcap(const void *ctx, const Packet *p); +static uint32_t DetectEngineTenantGetIdFromLivedev(const void *ctx, const Packet *p); +static uint32_t DetectEngineTenantGetIdFromVlanId(const void *ctx, const Packet *p); +static uint32_t DetectEngineTenantGetIdFromPcap(const void *ctx, const Packet *p); static DetectEngineAppInspectionEngine *g_app_inspect_engines = NULL; static DetectEnginePktInspectionEngine *g_pkt_inspect_engines = NULL; @@ -3161,15 +3161,15 @@ static TmEcode DetectEngineThreadCtxInitForMT(ThreadVars *tv, DetectEngineThread SCLogDebug("TENANT_SELECTOR_UNKNOWN"); break; case TENANT_SELECTOR_VLAN: - det_ctx->TenantGetId = DetectEngineTentantGetIdFromVlanId; + det_ctx->TenantGetId = DetectEngineTenantGetIdFromVlanId; SCLogDebug("TENANT_SELECTOR_VLAN"); break; case TENANT_SELECTOR_LIVEDEV: - det_ctx->TenantGetId = DetectEngineTentantGetIdFromLivedev; + det_ctx->TenantGetId = DetectEngineTenantGetIdFromLivedev; SCLogDebug("TENANT_SELECTOR_LIVEDEV"); break; case TENANT_SELECTOR_DIRECT: - det_ctx->TenantGetId = DetectEngineTentantGetIdFromPcap; + det_ctx->TenantGetId = DetectEngineTenantGetIdFromPcap; SCLogDebug("TENANT_SELECTOR_DIRECT"); break; } @@ -4038,7 +4038,7 @@ static int DetectEngineMultiTenantSetupLoadLivedevMappings(const ConfNode *mappi ld->tenant_id = tenant_id; ld->tenant_id_set = true; - if (DetectEngineTentantRegisterLivedev(tenant_id, ld->id) != 0) { + if (DetectEngineTenantRegisterLivedev(tenant_id, ld->id) != 0) { goto error; } @@ -4097,7 +4097,7 @@ static int DetectEngineMultiTenantSetupLoadVlanMappings(const ConfNode *mappings goto bad_mapping; } - if (DetectEngineTentantRegisterVlanId(tenant_id, vlan_id) != 0) { + if (DetectEngineTenantRegisterVlanId(tenant_id, vlan_id) != 0) { goto error; } SCLogConfig("vlan %u connected to tenant-id %u", vlan_id, tenant_id); @@ -4274,7 +4274,7 @@ error: return -1; } -static uint32_t DetectEngineTentantGetIdFromVlanId(const void *ctx, const Packet *p) +static uint32_t DetectEngineTenantGetIdFromVlanId(const void *ctx, const Packet *p) { const DetectEngineThreadCtx *det_ctx = ctx; uint32_t x = 0; @@ -4298,7 +4298,7 @@ static uint32_t DetectEngineTentantGetIdFromVlanId(const void *ctx, const Packet return 0; } -static uint32_t DetectEngineTentantGetIdFromLivedev(const void *ctx, const Packet *p) +static uint32_t DetectEngineTenantGetIdFromLivedev(const void *ctx, const Packet *p) { const DetectEngineThreadCtx *det_ctx = ctx; const LiveDevice *ld = p->livedev; @@ -4310,8 +4310,8 @@ static uint32_t DetectEngineTentantGetIdFromLivedev(const void *ctx, const Packe return ld->tenant_id; } -static int DetectEngineTentantRegisterSelector(enum DetectEngineTenantSelectors selector, - uint32_t tenant_id, uint32_t traffic_id) +static int DetectEngineTenantRegisterSelector( + enum DetectEngineTenantSelectors selector, uint32_t tenant_id, uint32_t traffic_id) { DetectEngineMasterCtx *master = &g_master_de_ctx; SCMutexLock(&master->lock); @@ -4351,8 +4351,8 @@ static int DetectEngineTentantRegisterSelector(enum DetectEngineTenantSelectors return 0; } -static int DetectEngineTentantUnregisterSelector(enum DetectEngineTenantSelectors selector, - uint32_t tenant_id, uint32_t traffic_id) +static int DetectEngineTenantUnregisterSelector( + enum DetectEngineTenantSelectors selector, uint32_t tenant_id, uint32_t traffic_id) { DetectEngineMasterCtx *master = &g_master_de_ctx; SCMutexLock(&master->lock); @@ -4387,34 +4387,35 @@ static int DetectEngineTentantUnregisterSelector(enum DetectEngineTenantSelector return -1; } -int DetectEngineTentantRegisterLivedev(uint32_t tenant_id, int device_id) +int DetectEngineTenantRegisterLivedev(uint32_t tenant_id, int device_id) { - return DetectEngineTentantRegisterSelector(TENANT_SELECTOR_LIVEDEV, tenant_id, (uint32_t)device_id); + return DetectEngineTenantRegisterSelector( + TENANT_SELECTOR_LIVEDEV, tenant_id, (uint32_t)device_id); } -int DetectEngineTentantRegisterVlanId(uint32_t tenant_id, uint16_t vlan_id) +int DetectEngineTenantRegisterVlanId(uint32_t tenant_id, uint16_t vlan_id) { - return DetectEngineTentantRegisterSelector(TENANT_SELECTOR_VLAN, tenant_id, (uint32_t)vlan_id); + return DetectEngineTenantRegisterSelector(TENANT_SELECTOR_VLAN, tenant_id, (uint32_t)vlan_id); } -int DetectEngineTentantUnregisterVlanId(uint32_t tenant_id, uint16_t vlan_id) +int DetectEngineTenantUnregisterVlanId(uint32_t tenant_id, uint16_t vlan_id) { - return DetectEngineTentantUnregisterSelector(TENANT_SELECTOR_VLAN, tenant_id, (uint32_t)vlan_id); + return DetectEngineTenantUnregisterSelector(TENANT_SELECTOR_VLAN, tenant_id, (uint32_t)vlan_id); } -int DetectEngineTentantRegisterPcapFile(uint32_t tenant_id) +int DetectEngineTenantRegisterPcapFile(uint32_t tenant_id) { SCLogInfo("registering %u %d 0", TENANT_SELECTOR_DIRECT, tenant_id); - return DetectEngineTentantRegisterSelector(TENANT_SELECTOR_DIRECT, tenant_id, 0); + return DetectEngineTenantRegisterSelector(TENANT_SELECTOR_DIRECT, tenant_id, 0); } -int DetectEngineTentantUnregisterPcapFile(uint32_t tenant_id) +int DetectEngineTenantUnregisterPcapFile(uint32_t tenant_id) { SCLogInfo("unregistering %u %d 0", TENANT_SELECTOR_DIRECT, tenant_id); - return DetectEngineTentantUnregisterSelector(TENANT_SELECTOR_DIRECT, tenant_id, 0); + return DetectEngineTenantUnregisterSelector(TENANT_SELECTOR_DIRECT, tenant_id, 0); } -static uint32_t DetectEngineTentantGetIdFromPcap(const void *ctx, const Packet *p) +static uint32_t DetectEngineTenantGetIdFromPcap(const void *ctx, const Packet *p) { return p->pcap_v.tenant_id; } diff --git a/src/detect-engine.h b/src/detect-engine.h index e593fb8cfd..7766490ac2 100644 --- a/src/detect-engine.h +++ b/src/detect-engine.h @@ -129,11 +129,11 @@ int DetectEngineReloadIsIdle(void); int DetectEngineLoadTenantBlocking(uint32_t tenant_id, const char *yaml); int DetectEngineReloadTenantBlocking(uint32_t tenant_id, const char *yaml, int reload_cnt); -int DetectEngineTentantRegisterLivedev(uint32_t tenant_id, int device_id); -int DetectEngineTentantRegisterVlanId(uint32_t tenant_id, uint16_t vlan_id); -int DetectEngineTentantUnregisterVlanId(uint32_t tenant_id, uint16_t vlan_id); -int DetectEngineTentantRegisterPcapFile(uint32_t tenant_id); -int DetectEngineTentantUnregisterPcapFile(uint32_t tenant_id); +int DetectEngineTenantRegisterLivedev(uint32_t tenant_id, int device_id); +int DetectEngineTenantRegisterVlanId(uint32_t tenant_id, uint16_t vlan_id); +int DetectEngineTenantUnregisterVlanId(uint32_t tenant_id, uint16_t vlan_id); +int DetectEngineTenantRegisterPcapFile(uint32_t tenant_id); +int DetectEngineTenantUnregisterPcapFile(uint32_t tenant_id); uint8_t DetectEngineInspectGenericList(DetectEngineCtx *, DetectEngineThreadCtx *, const struct DetectEngineAppInspectionEngine_ *, const Signature *, Flow *, uint8_t, void *, diff --git a/src/runmode-unix-socket.c b/src/runmode-unix-socket.c index 9b3fc9482c..5469d66e33 100644 --- a/src/runmode-unix-socket.c +++ b/src/runmode-unix-socket.c @@ -903,7 +903,7 @@ TmEcode UnixSocketRegisterTenantHandler(json_t *cmd, json_t* answer, void *data) /* 4 add to system */ int r = -1; if (strcmp(htype, "pcap") == 0) { - r = DetectEngineTentantRegisterPcapFile(tenant_id); + r = DetectEngineTenantRegisterPcapFile(tenant_id); } else if (strcmp(htype, "vlan") == 0) { if (traffic_id < 0) { json_object_set_new(answer, "message", json_string("vlan requires argument")); @@ -915,7 +915,7 @@ TmEcode UnixSocketRegisterTenantHandler(json_t *cmd, json_t* answer, void *data) } SCLogInfo("VLAN handler: id %u maps to tenant %u", (uint32_t)traffic_id, tenant_id); - r = DetectEngineTentantRegisterVlanId(tenant_id, (uint16_t)traffic_id); + r = DetectEngineTenantRegisterVlanId(tenant_id, (uint16_t)traffic_id); } if (r != 0) { json_object_set_new(answer, "message", json_string("handler setup failure")); @@ -984,7 +984,7 @@ TmEcode UnixSocketUnregisterTenantHandler(json_t *cmd, json_t* answer, void *dat /* 4 add to system */ int r = -1; if (strcmp(htype, "pcap") == 0) { - r = DetectEngineTentantUnregisterPcapFile(tenant_id); + r = DetectEngineTenantUnregisterPcapFile(tenant_id); } else if (strcmp(htype, "vlan") == 0) { if (traffic_id < 0) { json_object_set_new(answer, "message", json_string("vlan requires argument")); @@ -996,7 +996,7 @@ TmEcode UnixSocketUnregisterTenantHandler(json_t *cmd, json_t* answer, void *dat } SCLogInfo("VLAN handler: removing mapping of %u to tenant %u", (uint32_t)traffic_id, tenant_id); - r = DetectEngineTentantUnregisterVlanId(tenant_id, (uint16_t)traffic_id); + r = DetectEngineTenantUnregisterVlanId(tenant_id, (uint16_t)traffic_id); } if (r != 0) { json_object_set_new(answer, "message", json_string("handler unregister failure"));