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

Remove wrong copyright info, cleanup headers.

Browse Source
remotes/origin/master-1.0.x
Victor Julien 17 years ago
parent afb08d388d
commit 449205cfeb
8 changed files with 72 additions and 164 deletions
Show Stats Download Patch File Download Diff File

28
src/app-layer-dcerpc-common.h
Unescape Escape View File

@ -1,26 +1,14 @@
/* /* Copyright (c) 2009,2010 Open Information Security Foundation */
* Copyright (c) 2009,2010 Open Information Security Foundation
* app-layer-dcerpc.h /**
* \file
* *
* \author Kirby Kuehl <kkuehl@gmail.com> * \author Kirby Kuehl <kkuehl@gmail.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#ifndef APPLAYERDCERPCCOMMON_H_ #ifndef __APP_LAYER_DCERPC_COMMON_H__
#define APPLAYERDCERPCCOMMON_H_ #define __APP_LAYER_DCERPC_COMMON_H__
#include "app-layer-protos.h" #include "app-layer-protos.h"
#include "app-layer-parser.h" #include "app-layer-parser.h"
#include "flow.h" #include "flow.h"
@ -187,5 +175,5 @@ int32_t DCERPCParser(DCERPC *dcerpc, uint8_t *input, uint32_t input_len);
void hexdump(const void *buf, size_t len); void hexdump(const void *buf, size_t len);
void printUUID(char *type, struct uuid_entry *uuid); void printUUID(char *type, struct uuid_entry *uuid);
#endif /* APPLAYERDCERPCCOMMON_H_ */ #endif /* __APP_LAYER_DCERPC_COMMON_H__ */

22
src/app-layer-dcerpc.c
Unescape Escape View File

@ -1,23 +1,11 @@
/* /* Copyright (c) 2009,2010 Open Information Security Foundation */
* Copyright (c) 2009, 2010 Open Information Security Foundation
* app-layer-dcerpc.c /**
* \file
* *
* \author Kirby Kuehl <kkuehl@gmail.com> * \author Kirby Kuehl <kkuehl@gmail.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#include "suricata-common.h" #include "suricata-common.h"
#include "suricata.h" #include "suricata.h"

30
src/app-layer-dcerpc.h
Unescape Escape View File

@ -1,26 +1,14 @@
/* /* Copyright (c) 2009,2010 Open Information Security Foundation */
* Copyright (c) 2009,2010 Open Information Security Foundation
* app-layer-dcerpc.h /**
* \file
* *
* \author Kirby Kuehl <kkuehl@gmail.com> * \author Kirby Kuehl <kkuehl@gmail.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#ifndef APPLAYERDCERPC_H_ #ifndef __APP_LAYER_DCERPC_H__
#define APPLAYERDCERPC_H_ #define __APP_LAYER_DCERPC_H__
#include "app-layer-protos.h" #include "app-layer-protos.h"
#include "app-layer-parser.h" #include "app-layer-parser.h"
#include "app-layer-dcerpc-common.h" #include "app-layer-dcerpc-common.h"
@ -30,11 +18,11 @@
typedef struct DCERPCState_ { typedef struct DCERPCState_ {
DCERPC dcerpc; DCERPC dcerpc;
}DCERPCState; } DCERPCState;
void RegisterDCERPCParsers(void); void RegisterDCERPCParsers(void);
void DCERPCParserTests(void); void DCERPCParserTests(void);
void DCERPCParserRegisterTests(void); void DCERPCParserRegisterTests(void);
#endif /* APPLAYERDCERPC_H_ */ #endif /* __APP_LAYER_DCERPC_H__ */

51
src/app-layer-nbss.h
Unescape Escape View File

@ -1,31 +1,20 @@
/* /* Copyright (c) 2009 Open Information Security Foundation */
* Copyright (c) 2009 Open Information Security Foundation
* app-layer-nbss.h /**
* \file
* *
* \author Kirby Kuehl <kkuehl@gmail.com> * \author Kirby Kuehl <kkuehl@gmail.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#ifndef APPLAYERNBSS_H_ #ifndef __APP_LAYER_NBSS_H__
#define APPLAYERNBSS_H_ #define __APP_LAYER_NBSS_H__
#include "suricata-common.h"
#include "app-layer-protos.h" #include "app-layer-protos.h"
#include "app-layer-parser.h" #include "app-layer-parser.h"
#include "flow.h" #include "flow.h"
#include "stream.h" #include "stream.h"
#include <stdint.h>
/* /*
http://ubiqx.org/cifs/rfc-draft/rfc1002.html#s4.3 http://ubiqx.org/cifs/rfc-draft/rfc1002.html#s4.3
All session packets are of the following general structure: All session packets are of the following general structure:
@ -43,18 +32,20 @@
The TYPE, FLAGS, and LENGTH fields are present in every session The TYPE, FLAGS, and LENGTH fields are present in every session
packet. packet.
*/ */
#define NBSS_SESSION_MESSAGE 0x00
#define NBSS_SESSION_REQUEST 0x81 #define NBSS_SESSION_MESSAGE 0x00
#define NBSS_POSITIVE_SESSION_RESPONSE 0x82 #define NBSS_SESSION_REQUEST 0x81
#define NBSS_NEGATIVE_SESSION_RESPONSE 0x83 #define NBSS_POSITIVE_SESSION_RESPONSE 0x82
#define NBSS_RETARGET_SESSION_RESPONSE 0x84 #define NBSS_NEGATIVE_SESSION_RESPONSE 0x83
#define NBSS_SESSION_KEEP_ALIVE 0x85 #define NBSS_RETARGET_SESSION_RESPONSE 0x84
#define NBSS_SESSION_KEEP_ALIVE 0x85
typedef struct nbss_hdr_ {
typedef struct NBSSHdr_ {
uint8_t type; uint8_t type;
uint8_t flags; uint8_t flags;
uint32_t length; uint32_t length;
}NBSSHdr; } NBSSHdr;
#define NBSS_HDR_LEN 4 #define NBSS_HDR_LEN 4
#endif /* APPLAYERNBSS_H_ */ #endif /* __APP_LAYER_NBSS_H__ */

22
src/app-layer-smb.c
Unescape Escape View File

@ -1,23 +1,11 @@
/* /* Copyright (c) 2009,2010 Open Information Security Foundation */
* Copyright (c) 2009, 2010 Open Information Security Foundation
* app-layer-smb.c /**
* \file
* *
* \author Kirby Kuehl <kkuehl@gmail.com> * \author Kirby Kuehl <kkuehl@gmail.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#include "suricata-common.h" #include "suricata-common.h"
#include "debug.h" #include "debug.h"

31
src/app-layer-smb.h
Unescape Escape View File

@ -1,31 +1,19 @@
/* /* Copyright (c) 2009,2010 Open Information Security Foundation */
* Copyright (c) 2009,2010 Open Information Security Foundation
* app-layer-smb.h /**
* \file
* *
* \author Kirby Kuehl <kkuehl@gmail.com> * \author Kirby Kuehl <kkuehl@gmail.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#ifndef APPLAYERSMB_H_ #ifndef __APP_LAYER_SMB_H__
#define APPLAYERSMB_H_ #define __APP_LAYER_SMB_H__
#include "suricata-common.h"
#include "app-layer-protos.h" #include "app-layer-protos.h"
#include "app-layer-parser.h" #include "app-layer-parser.h"
#include "flow.h" #include "flow.h"
#include "stream.h" #include "stream.h"
#include <stdint.h>
#include "app-layer-nbss.h" #include "app-layer-nbss.h"
#include "app-layer-dcerpc-common.h" #include "app-layer-dcerpc-common.h"
@ -43,6 +31,7 @@ typedef struct smb_hdr_ {
uint16_t uid; uint16_t uid;
uint16_t mid; uint16_t mid;
}SMBHdr; }SMBHdr;
#define SMB_HDR_LEN 32 #define SMB_HDR_LEN 32
#define MINIMUM_SMB_LEN 35 #define MINIMUM_SMB_LEN 35
#define NBSS_SMB_HDRS_LEN 36 #define NBSS_SMB_HDRS_LEN 36
@ -155,5 +144,5 @@ void RegisterSMBParsers(void);
void SMBParserRegisterTests(void); void SMBParserRegisterTests(void);
int isAndX(SMBState *smb_state); int isAndX(SMBState *smb_state);
#endif /* __APP_LAYER_SMB_H__ */
#endif /* APPLAYERSMB_H_ */

22
src/app-layer-smb2.c
Unescape Escape View File

@ -1,23 +1,11 @@
/* /* Copyright (c) 2009,2010 Open Information Security Foundation */
* Copyright (c) 2009,2010 Open Information Security Foundation
* app-layer-smb.c /**
* \file
* *
* \author Kirby Kuehl <kkuehl@gmail.com> * \author Kirby Kuehl <kkuehl@gmail.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#include "suricata-common.h" #include "suricata-common.h"
#include "debug.h" #include "debug.h"

30
src/app-layer-smb2.h
Unescape Escape View File

@ -1,32 +1,20 @@
/* /* Copyright (c) 2009,2010 Open Information Security Foundation */
* Copyright (c) 2009,2010 Open Information Security Foundation
* app-layer-smb2.h /**
* \file
* *
* \author Kirby Kuehl <kkuehl@gmail.com> * \author Kirby Kuehl <kkuehl@gmail.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#ifndef APPLAYERSMB2_H_ #ifndef __APP_LAYER_SMB2_H__
#define APPLAYERSMB2_H_ #define __APP_LAYER_SMB2_H__
#include "suricata-common.h"
#include "app-layer-protos.h" #include "app-layer-protos.h"
#include "app-layer-parser.h" #include "app-layer-parser.h"
#include "app-layer-nbss.h" #include "app-layer-nbss.h"
#include "flow.h" #include "flow.h"
#include "stream.h" #include "stream.h"
#include <stdint.h>
typedef struct smb2_hdr { typedef struct smb2_hdr {
uint32_t Protocol; // Contains 0xFE,'SMB' uint32_t Protocol; // Contains 0xFE,'SMB'
@ -76,5 +64,5 @@ typedef struct SMB2State_ {
void RegisterSMB2Parsers(void); void RegisterSMB2Parsers(void);
void SMB2ParserRegisterTests(void); void SMB2ParserRegisterTests(void);
#endif /* __APP_LAYER_SMB2_H__ */
#endif /* APPLAYERSMB2_H_ */

Write Preview
Loading…
Cancel
Save