detect: mark alproto in keyword reg deprecated

No existing code uses it, and it had been useless for some time.
pull/2245/head
Victor Julien 9 years ago
parent e173016ded
commit 99dce740ef

@ -4204,8 +4204,6 @@ static inline void SigMultilinePrint(int i, char *prefix)
if (sigmatch_table[i].desc) {
printf("%sDescription: %s\n", prefix, sigmatch_table[i].desc);
}
printf("%sProtocol: %s\n", prefix,
AppLayerGetProtoName(sigmatch_table[i].alproto));
printf("%sFeatures: ", prefix);
PrintFeatureList(sigmatch_table[i].flags, ',');
if (sigmatch_table[i].url) {
@ -4218,7 +4216,6 @@ void SigTableList(const char *keyword)
{
size_t size = sizeof(sigmatch_table) / sizeof(SigTableElmt);
size_t i;
char *proto_name;
if (keyword == NULL) {
printf("=====Supported keywords=====\n");
@ -4243,8 +4240,7 @@ void SigTableList(const char *keyword)
printf("%s", sigmatch_table[i].desc);
}
/* Build feature */
proto_name = AppLayerGetProtoName(sigmatch_table[i].alproto);
printf(";%s;", proto_name ? proto_name : "Unset");
printf(";Unset;"); // this used to be alproto
PrintFeatureList(sigmatch_table[i].flags, ':');
printf(";");
if (sigmatch_table[i].url) {

@ -889,9 +889,6 @@ typedef struct SigTableElmt_ {
Flow *, /**< *LOCKED* flow */
uint8_t flags, File *, Signature *, SigMatch *);
/** app layer proto from app-layer-protos.h this match applies to */
AppProto alproto;
/** keyword setup function pointer */
int (*Setup)(DetectEngineCtx *, Signature *, char *);
@ -899,6 +896,10 @@ typedef struct SigTableElmt_ {
void (*RegisterTests)(void);
uint8_t flags;
/** unused: warn user. Will be removed in the future. */
AppProto alproto __attribute__((deprecated));
char *name; /**< keyword name alias */
char *alias; /**< name alias */
char *desc;

Loading…
Cancel
Save