Commit aa3bacd5 authored by 's avatar
Browse files

removed mapi_errors.h from mapi.h (for internal use only - the user doesn't need it)


git-svn-id: file:///home/svn/mapi/trunk@558 8d5bb341-7cf1-0310-8cf6-ba355fef3186
parent 8e9ff8e1
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include "mapi.h" #include "mapi.h"
#include "mapiipc.h" #include "mapiipc.h"
#include "parseconf.h" #include "parseconf.h"
#include "mapi_errors.h"
#include "mapilibhandler.h" #include "mapilibhandler.h"
#define MAXPENDING 500 /* Maximum outstanding connection requests */ #define MAXPENDING 500 /* Maximum outstanding connection requests */
......
...@@ -13,8 +13,9 @@ ...@@ -13,8 +13,9 @@
#include "mapidevices.h" #include "mapidevices.h"
#include "debug.h" #include "debug.h"
#include "mapidflib.h" #include "mapidflib.h"
#include "mapi_errors.h"
#define TIME_M 257698037760ULL #define TIME_M 25769803760ULL
#define TIME_S 4294967296ULL #define TIME_S 4294967296ULL
#define TIME_MS 4294967 #define TIME_MS 4294967
#define TIME_US 4294 #define TIME_US 4294
......
...@@ -6,8 +6,6 @@ ...@@ -6,8 +6,6 @@
#include <syslog.h> #include <syslog.h>
#define PAPI 10 #define PAPI 10
#include "mapi_errors.h"
#ifndef TRUE #ifndef TRUE
#define TRUE 1 #define TRUE 1
#endif #endif
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include "mapidevices.h" #include "mapidevices.h"
#include "debug.h" #include "debug.h"
#include "printfstring.h" #include "printfstring.h"
#include "mapi_errors.h"
//Stores information about flows in mapidlib //Stores information about flows in mapidlib
typedef struct mapidlibflow { typedef struct mapidlibflow {
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include "mapilibhandler.h" #include "mapilibhandler.h"
#include "debug.h" #include "debug.h"
#include "mapi_errors.h"
typedef struct libinfo { typedef struct libinfo {
mapidflib_functionlist_t* functions; mapidflib_functionlist_t* functions;
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include "mapidrv.h" #include "mapidrv.h"
#include "mapidlib.h" #include "mapidlib.h"
#include "mapi_errors.h"
#include "mapidevices.h" #include "mapidevices.h"
#include "flist.h" #include "flist.h"
#include "debug.h" #include "debug.h"
......
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "mapi_errors.h"
#include "mapi.h" #include "mapi.h"
#include "mapipktdecoder.h" #include "mapipktdecoder.h"
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include "mapidflib.h" #include "mapidflib.h"
#include "mapidlib.h" #include "mapidlib.h"
#include "mapidevices.h" #include "mapidevices.h"
#include "mapi_errors.h"
#include "mapid.h" #include "mapid.h"
#include "fhelp.h" #include "fhelp.h"
#include "binop.h" #include "binop.h"
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include "mapidevices.h" #include "mapidevices.h"
#include "mapid.h" #include "mapid.h"
#include "fhelp.h" #include "fhelp.h"
#include "mapi_errors.h"
#define BPF_FILTER "BPF_FILTER" #define BPF_FILTER "BPF_FILTER"
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include "mapidflib.h" #include "mapidflib.h"
#include "mapidlib.h" #include "mapidlib.h"
#include "mapidevices.h" #include "mapidevices.h"
#include "mapi_errors.h"
#include "mapid.h" #include "mapid.h"
#include "fhelp.h" #include "fhelp.h"
#include "bucket.h" #include "bucket.h"
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include "fhelp.h" #include "fhelp.h"
#include "debug.h" #include "debug.h"
#include "dist.h" #include "dist.h"
#include "mapi_errors.h"
int dist_old = 1; int dist_old = 1;
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include <netinet/ip_icmp.h> /* struct icmp */ #include <netinet/ip_icmp.h> /* struct icmp */
#include <assert.h> #include <assert.h>
#include <pcap.h> /* DLT_EN10MB */ #include <pcap.h> /* DLT_EN10MB */
#include "mapi_errors.h"
#include "mapidflib.h" #include "mapidflib.h"
#include "mapidlib.h" #include "mapidlib.h"
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include "mapidflib.h" #include "mapidflib.h"
#include "mapidlib.h" #include "mapidlib.h"
#include "mapidevices.h" #include "mapidevices.h"
#include "mapi_errors.h"
#include "mapid.h" #include "mapid.h"
#include "fhelp.h" #include "fhelp.h"
#include "hashsamp.h" #include "hashsamp.h"
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include "mapidflib.h" #include "mapidflib.h"
#include "mapidlib.h" #include "mapidlib.h"
#include "mapidevices.h" #include "mapidevices.h"
#include "mapi_errors.h"
#include "mapid.h" #include "mapid.h"
#include "fhelp.h" #include "fhelp.h"
#include "pktinfo.h" #include "pktinfo.h"
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include "mapidevices.h" #include "mapidevices.h"
#include "mapid.h" #include "mapid.h"
#include "fhelp.h" #include "fhelp.h"
#include "mapi_errors.h"
#include <pcre.h> #include <pcre.h>
struct mapid_regexp { struct mapid_regexp {
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include "mapidflib.h" #include "mapidflib.h"
#include "mapidlib.h" #include "mapidlib.h"
#include "mapidevices.h" #include "mapidevices.h"
#include "mapi_errors.h"
#include "mapid.h" #include "mapid.h"
#include "fhelp.h" #include "fhelp.h"
#include "res2file.h" #include "res2file.h"
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include "mapidflib.h" #include "mapidflib.h"
#include "mapidlib.h" #include "mapidlib.h"
#include "mapidevices.h" #include "mapidevices.h"
#include "mapi_errors.h"
#include "mapid.h" #include "mapid.h"
#include "fhelp.h" #include "fhelp.h"
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include "mapidflib.h" #include "mapidflib.h"
#include "mapidlib.h" #include "mapidlib.h"
#include "mapidevices.h" #include "mapidevices.h"
#include "mapi_errors.h"
#include "mapid.h" #include "mapid.h"
#include "fhelp.h" #include "fhelp.h"
#include "stats.h" #include "stats.h"
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include "debug.h" #include "debug.h"
#include "mapiipc.h" #include "mapiipc.h"
#include "mstring.h" #include "mstring.h"
#include "mapi_errors.h"
struct mapid_strsearch { struct mapid_strsearch {
unsigned char *str; /* string to search for in payload (without '\0')*/ unsigned char *str; /* string to search for in payload (without '\0')*/
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include "mapidflib.h" #include "mapidflib.h"
#include "mapidlib.h" #include "mapidlib.h"
#include "mapidevices.h" #include "mapidevices.h"
#include "mapi_errors.h"
#include "mapid.h" #include "mapid.h"
#include "fhelp.h" #include "fhelp.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment