fixed a problem with extern C methods

joeferner · Jan 25, 2012 · 48aad43 · 48aad43
1 parent 900f2c3
commit 48aad43
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 31 deletions.
diff --git a/examples/package.json b/examples/package.json
@@ -4,7 +4,6 @@
   "private": true,
   "dependencies": {
     "optimist": "~0.3.1",
-    "pcap-parser": "~0.0.3",
-    "nodeshark": "~0.0.1"
+    "pcap-parser": "~0.0.3"
   }
 }
diff --git a/examples/print.js b/examples/print.js
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 var optimist = require('optimist');
-var nodeshark = require("nodeshark");
+var nodeshark = require("../");
 var pcapp = require("pcap-parser");
 
 var argv = optimist

diff --git a/src/dissector.h b/src/dissector.h
@@ -11,18 +11,20 @@
 #include <ctype.h>
 #include <locale.h>
 #include <limits.h>
-#include <config.h>
-#include <epan/epan.h>
-#include <wsutil/privileges.h>
-#include <epan/epan_dissect.h>
-#include <epan/to_str.h>
-#include <epan/timestamp.h>
-#include <epan/prefs.h>
-#include <epan/column.h>
-#include <epan/packet.h>
-#include <epan/plugins.h>
-#include <cfile.h>
-#include <log.h>
+extern "C" {
+  #include <config.h>
+  #include <epan/epan.h>
+  #include <wsutil/privileges.h>
+  #include <epan/epan_dissect.h>
+  #include <epan/to_str.h>
+  #include <epan/timestamp.h>
+  #include <epan/prefs.h>
+  #include <epan/column.h>
+  #include <epan/packet.h>
+  #include <epan/plugins.h>
+  #include <cfile.h>
+  #include <log.h>
+}
 #include <glib.h>
 #include <string>
 

diff --git a/src/dissectorNode.h b/src/dissectorNode.h
@@ -4,19 +4,21 @@
 
 #include <v8.h>
 #include <node.h>
-#include <config.h>
-#include <epan/epan.h>
+extern "C" {
+  #include <config.h>
+  #include <epan/epan.h>
+}
 
 class DissectorNode : node::ObjectWrap {
 public:
   static void Init(v8::Handle<v8::Object> target);
   static v8::Local<v8::Object> New(DissectorNode *root, frame_data *fdata, epan_dissect_t *edt, proto_node *node);
   bool isRoot() { return this == m_root; }
-  
+
 private:
   DissectorNode(DissectorNode *root, frame_data *fdata, epan_dissect_t *edt, proto_node *node);
   ~DissectorNode();
-  
+
   static void NotImplementedSetter(v8::Local<v8::String> property, v8::Local<v8::Value> value, const v8::AccessorInfo& info);
   static v8::Handle<v8::Value> AbbreviationGetter(v8::Local<v8::String> property, const v8::AccessorInfo& info);
   static int getPositionInPacket(proto_node *node, field_info *fi);
@@ -36,7 +38,7 @@ class DissectorNode : node::ObjectWrap {
   static void rawDataSetter(v8::Local<v8::String> property, v8::Local<v8::Value> value, const v8::AccessorInfo& info);
   v8::Handle<v8::Value> getAbbreviation(proto_node *node);
   static v8::Handle<v8::Value> getRepresentation(proto_node *node);
-  
+
   static v8::Persistent<v8::FunctionTemplate> s_ct;
   DissectorNode *m_root;
   frame_data *m_fdata;

diff --git a/src/lazyDataSource.h b/src/lazyDataSource.h
@@ -4,8 +4,10 @@
 
 #include <v8.h>
 #include <node.h>
-#include <config.h>
-#include <epan/epan.h>
+extern "C" {
+  #include <config.h>
+  #include <epan/epan.h>
+}
 #include <node_buffer.h>
 
 class DissectorNode;
@@ -15,12 +17,12 @@ class LazyDataSource : node::ObjectWrap {
   static void Init(v8::Handle<v8::Object> target);
   static v8::Local<v8::Object> New(DissectorNode *parent, tvbuff_t *tvb);
   node::Buffer* createBuffer();
-  DissectorNode* getParent() { return m_parent; }  
-  
+  DissectorNode* getParent() { return m_parent; }
+
 private:
   LazyDataSource(DissectorNode *parent, tvbuff_t *tvb);
   ~LazyDataSource();
-  
+
   static v8::Persistent<v8::FunctionTemplate> s_ct;
   DissectorNode *m_parent;
   tvbuff_t *m_tvb;

diff --git a/src/lazyDissectorNode.h b/src/lazyDissectorNode.h
@@ -4,19 +4,21 @@
 
 #include <v8.h>
 #include <node.h>
-#include <config.h>
-#include <epan/epan.h>
+extern "C" {
+  #include <config.h>
+  #include <epan/epan.h>
+}
 
 class LazyDissectorNode : node::ObjectWrap {
 public:
   static void Init(v8::Handle<v8::Object> target);
   static v8::Local<v8::Object> New(frame_data *fdata, epan_dissect_t *edt, proto_node *node);
   proto_node* getProtoNode() { return m_node; }
-  
+
 private:
   LazyDissectorNode(frame_data *fdata, epan_dissect_t *edt, proto_node *node);
   ~LazyDissectorNode();
-  
+
   static v8::Persistent<v8::FunctionTemplate> s_ct;
   frame_data *m_fdata;
   epan_dissect_t *m_edt;

diff --git a/src/nodeshark.h b/src/nodeshark.h
@@ -11,8 +11,10 @@
 #include <ctype.h>
 #include <locale.h>
 #include <limits.h>
-#include <config.h>
-#include <epan/epan.h>
+extern "C" {
+  #include <config.h>
+  #include <epan/epan.h>
+}
 
 class NodeShark : node::ObjectWrap {
 public: