aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rust: remove unnecessary nested unsafe

Browse Source
pull/11320/head
Philippe Antoine 1 year ago committed by Victor Julien
parent 4ccbcc4684
commit 5bb5b4f46f
4 changed files with 227 additions and 289 deletions
Show Stats Download Patch File Download Diff File

6
rust/src/dhcp/detect.rs
Unescape Escape View File

@ -175,7 +175,6 @@ pub unsafe extern "C" fn ScDetectDHCPRegister() {
Free: Some(dhcp_detect_time_free),
flags: 0,
};
unsafe {
G_DHCP_LEASE_TIME_KW_ID = DetectHelperKeywordRegister(&kw);
G_DHCP_LEASE_TIME_BUFFER_ID = DetectHelperBufferRegister(
b"dhcp.leasetime\0".as_ptr() as *const libc::c_char,
@ -183,7 +182,6 @@ pub unsafe extern "C" fn ScDetectDHCPRegister() {
true,
true,
);
}
let kw = SCSigTableElmt {
name: b"dhcp.rebinding_time\0".as_ptr() as *const libc::c_char,
desc: b"match DHCP rebinding time\0".as_ptr() as *const libc::c_char,
@ -193,7 +191,6 @@ pub unsafe extern "C" fn ScDetectDHCPRegister() {
Free: Some(dhcp_detect_time_free),
flags: 0,
};
unsafe {
G_DHCP_REBINDING_TIME_KW_ID = DetectHelperKeywordRegister(&kw);
G_DHCP_REBINDING_TIME_BUFFER_ID = DetectHelperBufferRegister(
b"dhcp.rebinding-time\0".as_ptr() as *const libc::c_char,
@ -201,7 +198,6 @@ pub unsafe extern "C" fn ScDetectDHCPRegister() {
true,
true,
);
}
let kw = SCSigTableElmt {
name: b"dhcp.renewal_time\0".as_ptr() as *const libc::c_char,
desc: b"match DHCP renewal time\0".as_ptr() as *const libc::c_char,
@ -211,7 +207,6 @@ pub unsafe extern "C" fn ScDetectDHCPRegister() {
Free: Some(dhcp_detect_time_free),
flags: 0,
};
unsafe {
G_DHCP_RENEWAL_TIME_KW_ID = DetectHelperKeywordRegister(&kw);
G_DHCP_RENEWAL_TIME_BUFFER_ID = DetectHelperBufferRegister(
b"dhcp.renewal-time\0".as_ptr() as *const libc::c_char,
@ -219,5 +214,4 @@ pub unsafe extern "C" fn ScDetectDHCPRegister() {
true,
true,
);
}
}

40
rust/src/enip/detect.rs
Unescape Escape View File

@ -1343,7 +1343,6 @@ pub unsafe extern "C" fn ScDetectEnipRegister() {
Free: Some(cipservice_free),
flags: 0,
};
unsafe {
G_ENIP_CIPSERVICE_KW_ID = DetectHelperKeywordRegister(&kw);
G_ENIP_CIPSERVICE_BUFFER_ID = DetectHelperBufferRegister(
b"cip\0".as_ptr() as *const libc::c_char,
@ -1351,7 +1350,6 @@ pub unsafe extern "C" fn ScDetectEnipRegister() {
true,
true,
);
}
let kw = SCSigTableElmt {
name: b"enip.capabilities\0".as_ptr() as *const libc::c_char,
desc: b"rules for detecting EtherNet/IP capabilities\0".as_ptr() as *const libc::c_char,
@ -1361,7 +1359,6 @@ pub unsafe extern "C" fn ScDetectEnipRegister() {
Free: Some(capabilities_free),
flags: 0,
};
unsafe {
G_ENIP_CAPABILITIES_KW_ID = DetectHelperKeywordRegister(&kw);
G_ENIP_CAPABILITIES_BUFFER_ID = DetectHelperBufferRegister(
b"enip.capabilities\0".as_ptr() as *const libc::c_char,
@ -1369,7 +1366,6 @@ pub unsafe extern "C" fn ScDetectEnipRegister() {
true,
true,
);
}
let kw = SCSigTableElmt {
name: b"enip.cip_attribute\0".as_ptr() as *const libc::c_char,
desc: b"rules for detecting EtherNet/IP cip_attribute\0".as_ptr() as *const libc::c_char,
@ -1379,7 +1375,6 @@ pub unsafe extern "C" fn ScDetectEnipRegister() {
Free: Some(cip_attribute_free),
flags: 0,
};
unsafe {
G_ENIP_CIP_ATTRIBUTE_KW_ID = DetectHelperKeywordRegister(&kw);
G_ENIP_CIP_ATTRIBUTE_BUFFER_ID = DetectHelperBufferRegister(
b"enip.cip_attribute\0".as_ptr() as *const libc::c_char,
@ -1387,7 +1382,6 @@ pub unsafe extern "C" fn ScDetectEnipRegister() {
true,
true,
);
}
let kw = SCSigTableElmt {
name: b"enip.cip_class\0".as_ptr() as *const libc::c_char,
desc: b"rules for detecting EtherNet/IP cip_class\0".as_ptr() as *const libc::c_char,
@ -1397,7 +1391,6 @@ pub unsafe extern "C" fn ScDetectEnipRegister() {
Free: Some(cip_class_free),
flags: 0,
};
unsafe {
G_ENIP_CIP_CLASS_KW_ID = DetectHelperKeywordRegister(&kw);
G_ENIP_CIP_CLASS_BUFFER_ID = DetectHelperBufferRegister(
b"enip.cip_class\0".as_ptr() as *const libc::c_char,
@ -1405,7 +1398,6 @@ pub unsafe extern "C" fn ScDetectEnipRegister() {
true,
true,
);
}
let kw = SCSigTableElmt {
name: b"enip.vendor_id\0".as_ptr() as *const libc::c_char,
desc: b"rules for detecting EtherNet/IP vendor_id\0".as_ptr() as *const libc::c_char,
@ -1415,7 +1407,6 @@ pub unsafe extern "C" fn ScDetectEnipRegister() {
Free: Some(vendor_id_free),
flags: 0,
};
unsafe {
G_ENIP_VENDOR_ID_KW_ID = DetectHelperKeywordRegister(&kw);
G_ENIP_VENDOR_ID_BUFFER_ID = DetectHelperBufferRegister(
b"enip.vendor_id\0".as_ptr() as *const libc::c_char,
@ -1423,7 +1414,6 @@ pub unsafe extern "C" fn ScDetectEnipRegister() {
true,
true,
);
}
let kw = SCSigTableElmt {
name: b"enip.status\0".as_ptr() as *const libc::c_char,
desc: b"rules for detecting EtherNet/IP status\0".as_ptr() as *const libc::c_char,
@ -1433,7 +1423,6 @@ pub unsafe extern "C" fn ScDetectEnipRegister() {
Free: Some(status_free),
flags: 0,
};
unsafe {
G_ENIP_STATUS_KW_ID = DetectHelperKeywordRegister(&kw);
G_ENIP_STATUS_BUFFER_ID = DetectHelperBufferRegister(
b"enip.status\0".as_ptr() as *const libc::c_char,
@ -1441,7 +1430,6 @@ pub unsafe extern "C" fn ScDetectEnipRegister() {
true,
true,
);
}
let kw = SCSigTableElmt {
name: b"enip.state\0".as_ptr() as *const libc::c_char,
desc: b"rules for detecting EtherNet/IP state\0".as_ptr() as *const libc::c_char,
@ -1451,7 +1439,6 @@ pub unsafe extern "C" fn ScDetectEnipRegister() {
Free: Some(state_free),
flags: 0,
};
unsafe {
G_ENIP_STATE_KW_ID = DetectHelperKeywordRegister(&kw);
G_ENIP_STATE_BUFFER_ID = DetectHelperBufferRegister(
b"enip.state\0".as_ptr() as *const libc::c_char,
@ -1459,7 +1446,6 @@ pub unsafe extern "C" fn ScDetectEnipRegister() {
true,
true,
);
}
let kw = SCSigTableElmt {
name: b"enip.serial\0".as_ptr() as *const libc::c_char,
desc: b"rules for detecting EtherNet/IP serial\0".as_ptr() as *const libc::c_char,
@ -1469,7 +1455,6 @@ pub unsafe extern "C" fn ScDetectEnipRegister() {
Free: Some(serial_free),
flags: 0,
};
unsafe {
G_ENIP_SERIAL_KW_ID = DetectHelperKeywordRegister(&kw);
G_ENIP_SERIAL_BUFFER_ID = DetectHelperBufferRegister(
b"enip.serial\0".as_ptr() as *const libc::c_char,
@ -1477,7 +1462,6 @@ pub unsafe extern "C" fn ScDetectEnipRegister() {
true,
true,
);
}
let kw = SCSigTableElmt {
name: b"enip.revision\0".as_ptr() as *const libc::c_char,
desc: b"rules for detecting EtherNet/IP revision\0".as_ptr() as *const libc::c_char,
@ -1487,7 +1471,6 @@ pub unsafe extern "C" fn ScDetectEnipRegister() {
Free: Some(revision_free),
flags: 0,
};
unsafe {
G_ENIP_REVISION_KW_ID = DetectHelperKeywordRegister(&kw);
G_ENIP_REVISION_BUFFER_ID = DetectHelperBufferRegister(
b"enip.revision\0".as_ptr() as *const libc::c_char,
@ -1495,7 +1478,6 @@ pub unsafe extern "C" fn ScDetectEnipRegister() {
true,
true,
);
}
let kw = SCSigTableElmt {
name: b"enip.protocol_version\0".as_ptr() as *const libc::c_char,
desc: b"rules for detecting EtherNet/IP protocol_version\0".as_ptr() as *const libc::c_char,
@ -1505,7 +1487,6 @@ pub unsafe extern "C" fn ScDetectEnipRegister() {
Free: Some(protocol_version_free),
flags: 0,
};
unsafe {
G_ENIP_PROTOCOL_VERSION_KW_ID = DetectHelperKeywordRegister(&kw);
G_ENIP_PROTOCOL_VERSION_BUFFER_ID = DetectHelperBufferRegister(
b"enip.protocol_version\0".as_ptr() as *const libc::c_char,
@ -1513,7 +1494,6 @@ pub unsafe extern "C" fn ScDetectEnipRegister() {
true,
true,
);
}
let kw = SCSigTableElmt {
name: b"enip.product_code\0".as_ptr() as *const libc::c_char,
desc: b"rules for detecting EtherNet/IP product_code\0".as_ptr() as *const libc::c_char,
@ -1523,7 +1503,6 @@ pub unsafe extern "C" fn ScDetectEnipRegister() {
Free: Some(product_code_free),
flags: 0,
};
unsafe {
G_ENIP_PRODUCT_CODE_KW_ID = DetectHelperKeywordRegister(&kw);
G_ENIP_PRODUCT_CODE_BUFFER_ID = DetectHelperBufferRegister(
b"enip.product_code\0".as_ptr() as *const libc::c_char,
@ -1531,7 +1510,6 @@ pub unsafe extern "C" fn ScDetectEnipRegister() {
true,
true,
);
}
let kw = SCSigTableElmt {
name: b"enip_command\0".as_ptr() as *const libc::c_char,
desc: b"rules for detecting EtherNet/IP command\0".as_ptr() as *const libc::c_char,
@ -1541,7 +1519,6 @@ pub unsafe extern "C" fn ScDetectEnipRegister() {
Free: Some(command_free),
flags: 0,
};
unsafe {
G_ENIP_COMMAND_KW_ID = DetectHelperKeywordRegister(&kw);
G_ENIP_COMMAND_BUFFER_ID = DetectHelperBufferRegister(
b"enip.command\0".as_ptr() as *const libc::c_char,
@ -1549,7 +1526,6 @@ pub unsafe extern "C" fn ScDetectEnipRegister() {
true,
true,
);
}
let kw = SCSigTableElmt {
name: b"enip.identity_status\0".as_ptr() as *const libc::c_char,
desc: b"rules for detecting EtherNet/IP identity_status\0".as_ptr() as *const libc::c_char,
@ -1559,7 +1535,6 @@ pub unsafe extern "C" fn ScDetectEnipRegister() {
Free: Some(identity_status_free),
flags: 0,
};
unsafe {
G_ENIP_IDENTITY_STATUS_KW_ID = DetectHelperKeywordRegister(&kw);
G_ENIP_IDENTITY_STATUS_BUFFER_ID = DetectHelperBufferRegister(
b"enip.identity_status\0".as_ptr() as *const libc::c_char,
@ -1567,7 +1542,6 @@ pub unsafe extern "C" fn ScDetectEnipRegister() {
true,
true,
);
}
let kw = SCSigTableElmt {
name: b"enip.device_type\0".as_ptr() as *const libc::c_char,
desc: b"rules for detecting EtherNet/IP device_type\0".as_ptr() as *const libc::c_char,
@ -1577,7 +1551,6 @@ pub unsafe extern "C" fn ScDetectEnipRegister() {
Free: Some(device_type_free),
flags: 0,
};
unsafe {
G_ENIP_DEVICE_TYPE_KW_ID = DetectHelperKeywordRegister(&kw);
G_ENIP_DEVICE_TYPE_BUFFER_ID = DetectHelperBufferRegister(
b"enip.device_type\0".as_ptr() as *const libc::c_char,
@ -1585,7 +1558,6 @@ pub unsafe extern "C" fn ScDetectEnipRegister() {
true,
true,
);
}
let kw = SCSigTableElmt {
name: b"enip_command\0".as_ptr() as *const libc::c_char,
desc: b"rules for detecting EtherNet/IP command\0".as_ptr() as *const libc::c_char,
@ -1595,7 +1567,6 @@ pub unsafe extern "C" fn ScDetectEnipRegister() {
Free: Some(command_free),
flags: 0,
};
unsafe {
G_ENIP_COMMAND_KW_ID = DetectHelperKeywordRegister(&kw);
G_ENIP_COMMAND_BUFFER_ID = DetectHelperBufferRegister(
b"enip.command\0".as_ptr() as *const libc::c_char,
@ -1603,7 +1574,6 @@ pub unsafe extern "C" fn ScDetectEnipRegister() {
true,
true,
);
}
let kw = SCSigTableElmt {
name: b"enip.cip_status\0".as_ptr() as *const libc::c_char,
desc: b"rules for detecting EtherNet/IP cip_status\0".as_ptr() as *const libc::c_char,
@ -1613,7 +1583,6 @@ pub unsafe extern "C" fn ScDetectEnipRegister() {
Free: Some(cip_status_free),
flags: 0,
};
unsafe {
G_ENIP_CIP_STATUS_KW_ID = DetectHelperKeywordRegister(&kw);
G_ENIP_CIP_STATUS_BUFFER_ID = DetectHelperBufferRegister(
b"enip.cip_status\0".as_ptr() as *const libc::c_char,
@ -1621,7 +1590,6 @@ pub unsafe extern "C" fn ScDetectEnipRegister() {
true,
true,
);
}
let kw = SCSigTableElmt {
name: b"enip.cip_instance\0".as_ptr() as *const libc::c_char,
desc: b"rules for detecting EtherNet/IP cip_instance\0".as_ptr() as *const libc::c_char,
@ -1631,7 +1599,6 @@ pub unsafe extern "C" fn ScDetectEnipRegister() {
Free: Some(cip_instance_free),
flags: 0,
};
unsafe {
G_ENIP_CIP_INSTANCE_KW_ID = DetectHelperKeywordRegister(&kw);
G_ENIP_CIP_INSTANCE_BUFFER_ID = DetectHelperBufferRegister(
b"enip.cip_instance\0".as_ptr() as *const libc::c_char,
@ -1639,7 +1606,6 @@ pub unsafe extern "C" fn ScDetectEnipRegister() {
true,
true,
);
}
let kw = SCSigTableElmt {
name: b"enip.cip_extendedstatus\0".as_ptr() as *const libc::c_char,
desc: b"rules for detecting EtherNet/IP cip_extendedstatus\0".as_ptr()
@ -1650,7 +1616,6 @@ pub unsafe extern "C" fn ScDetectEnipRegister() {
Free: Some(cip_extendedstatus_free),
flags: 0,
};
unsafe {
G_ENIP_CIP_EXTENDEDSTATUS_KW_ID = DetectHelperKeywordRegister(&kw);
G_ENIP_CIP_EXTENDEDSTATUS_BUFFER_ID = DetectHelperBufferRegister(
b"enip.cip_extendedstatus\0".as_ptr() as *const libc::c_char,
@ -1658,7 +1623,6 @@ pub unsafe extern "C" fn ScDetectEnipRegister() {
true,
true,
);
}
let kw = SCSigTableElmt {
name: b"enip.product_name\0".as_ptr() as *const libc::c_char,
desc: b"sticky buffer to match EtherNet/IP product name\0".as_ptr() as *const libc::c_char,
@ -1668,7 +1632,6 @@ pub unsafe extern "C" fn ScDetectEnipRegister() {
AppLayerTxMatch: None,
Free: None,
};
unsafe {
let _g_enip_product_name_kw_id = DetectHelperKeywordRegister(&kw);
G_ENIP_PRODUCT_NAME_BUFFER_ID = DetectHelperBufferMpmRegister(
b"enip.product_name\0".as_ptr() as *const libc::c_char,
@ -1678,7 +1641,6 @@ pub unsafe extern "C" fn ScDetectEnipRegister() {
true,
product_name_get_data,
);
}
let kw = SCSigTableElmt {
name: b"enip.service_name\0".as_ptr() as *const libc::c_char,
desc: b"sticky buffer to match EtherNet/IP service name\0".as_ptr() as *const libc::c_char,
@ -1688,7 +1650,6 @@ pub unsafe extern "C" fn ScDetectEnipRegister() {
AppLayerTxMatch: None,
Free: None,
};
unsafe {
let _g_enip_service_name_kw_id = DetectHelperKeywordRegister(&kw);
G_ENIP_SERVICE_NAME_BUFFER_ID = DetectHelperBufferMpmRegister(
b"enip.service_name\0".as_ptr() as *const libc::c_char,
@ -1698,7 +1659,6 @@ pub unsafe extern "C" fn ScDetectEnipRegister() {
true,
service_name_get_data,
);
}
}
#[cfg(test)]

8
rust/src/snmp/detect.rs
Unescape Escape View File

@ -193,7 +193,6 @@ pub unsafe extern "C" fn ScDetectSNMPRegister() {
Free: Some(snmp_detect_version_free),
flags: 0,
};
unsafe {
G_SNMP_VERSION_KW_ID = DetectHelperKeywordRegister(&kw);
G_SNMP_VERSION_BUFFER_ID = DetectHelperBufferRegister(
b"snmp.version\0".as_ptr() as *const libc::c_char,
@ -201,7 +200,6 @@ pub unsafe extern "C" fn ScDetectSNMPRegister() {
true,
true,
);
}
let kw = SCSigTableElmt {
name: b"snmp.pdu_type\0".as_ptr() as *const libc::c_char,
@ -212,7 +210,6 @@ pub unsafe extern "C" fn ScDetectSNMPRegister() {
Free: Some(snmp_detect_pdutype_free),
flags: 0,
};
unsafe {
G_SNMP_PDUTYPE_KW_ID = DetectHelperKeywordRegister(&kw);
G_SNMP_PDUTYPE_BUFFER_ID = DetectHelperBufferRegister(
b"snmp.pdu_type\0".as_ptr() as *const libc::c_char,
@ -220,7 +217,6 @@ pub unsafe extern "C" fn ScDetectSNMPRegister() {
true,
true,
);
}
let kw = SCSigTableElmt {
name: b"snmp.usm\0".as_ptr() as *const libc::c_char,
@ -231,7 +227,6 @@ pub unsafe extern "C" fn ScDetectSNMPRegister() {
AppLayerTxMatch: None,
Free: None,
};
unsafe {
let _g_snmp_usm_kw_id = DetectHelperKeywordRegister(&kw);
G_SNMP_USM_BUFFER_ID = DetectHelperBufferMpmRegister(
b"snmp.usm\0".as_ptr() as *const libc::c_char,
@ -241,7 +236,6 @@ pub unsafe extern "C" fn ScDetectSNMPRegister() {
true,
snmp_detect_usm_get_data,
);
}
let kw = SCSigTableElmt {
name: b"snmp.community\0".as_ptr() as *const libc::c_char,
@ -253,7 +247,6 @@ pub unsafe extern "C" fn ScDetectSNMPRegister() {
AppLayerTxMatch: None,
Free: None,
};
unsafe {
let _g_snmp_community_kw_id = DetectHelperKeywordRegister(&kw);
G_SNMP_COMMUNITY_BUFFER_ID = DetectHelperBufferMpmRegister(
b"snmp.community\0".as_ptr() as *const libc::c_char,
@ -263,5 +256,4 @@ pub unsafe extern "C" fn ScDetectSNMPRegister() {
true,
snmp_detect_community_get_data,
);
}
}

8
rust/src/websocket/detect.rs
Unescape Escape View File

@ -287,7 +287,6 @@ pub unsafe extern "C" fn ScDetectWebsocketRegister() {
Free: Some(websocket_detect_opcode_free),
flags: 0,
};
unsafe {
G_WEBSOCKET_OPCODE_KW_ID = DetectHelperKeywordRegister(&kw);
G_WEBSOCKET_OPCODE_BUFFER_ID = DetectHelperBufferRegister(
b"websocket.opcode\0".as_ptr() as *const libc::c_char,
@ -295,7 +294,6 @@ pub unsafe extern "C" fn ScDetectWebsocketRegister() {
true,
true,
);
}
let kw = SCSigTableElmt {
name: b"websocket.mask\0".as_ptr() as *const libc::c_char,
desc: b"match WebSocket mask\0".as_ptr() as *const libc::c_char,
@ -305,7 +303,6 @@ pub unsafe extern "C" fn ScDetectWebsocketRegister() {
Free: Some(websocket_detect_mask_free),
flags: 0,
};
unsafe {
G_WEBSOCKET_MASK_KW_ID = DetectHelperKeywordRegister(&kw);
G_WEBSOCKET_MASK_BUFFER_ID = DetectHelperBufferRegister(
b"websocket.mask\0".as_ptr() as *const libc::c_char,
@ -313,7 +310,6 @@ pub unsafe extern "C" fn ScDetectWebsocketRegister() {
true,
true,
);
}
let kw = SCSigTableElmt {
name: b"websocket.flags\0".as_ptr() as *const libc::c_char,
desc: b"match WebSocket flags\0".as_ptr() as *const libc::c_char,
@ -323,7 +319,6 @@ pub unsafe extern "C" fn ScDetectWebsocketRegister() {
Free: Some(websocket_detect_flags_free),
flags: 0,
};
unsafe {
G_WEBSOCKET_FLAGS_KW_ID = DetectHelperKeywordRegister(&kw);
G_WEBSOCKET_FLAGS_BUFFER_ID = DetectHelperBufferRegister(
b"websocket.flags\0".as_ptr() as *const libc::c_char,
@ -331,7 +326,6 @@ pub unsafe extern "C" fn ScDetectWebsocketRegister() {
true,
true,
);
}
let kw = SCSigTableElmt {
name: b"websocket.payload\0".as_ptr() as *const libc::c_char,
desc: b"match WebSocket payload\0".as_ptr() as *const libc::c_char,
@ -341,7 +335,6 @@ pub unsafe extern "C" fn ScDetectWebsocketRegister() {
AppLayerTxMatch: None,
Free: None,
};
unsafe {
let _g_ws_payload_kw_id = DetectHelperKeywordRegister(&kw);
G_WEBSOCKET_PAYLOAD_BUFFER_ID = DetectHelperBufferMpmRegister(
b"websocket.payload\0".as_ptr() as *const libc::c_char,
@ -351,5 +344,4 @@ pub unsafe extern "C" fn ScDetectWebsocketRegister() {
true,
websocket_detect_payload_get_data,
);
}
}

Write Preview
Loading…
Cancel
Save