Changeset ad49c9d96804ded80d32f8bb271ad728841209ce

Timestamp:

06/21/2010 03:32:04 PM (2 years ago)

Author:

Adrien Demarez <adrien.demarez@…>

Parents:

87b9442439e824bb10ace9cbb48d5a40bea6734b

git-committer:

Adrien Demarez <adrien.demarez@…> (06/21/2010 03:32:04 PM)

Message:

Fix crash because freeing the pcap context inside the pcap callback

Location:

src

Files:

• common_thp.cpp (modified) (3 diffs)
• common_thp.h (modified) (2 diffs)
• ms_thp.cpp (modified) (1 diff)
• wimax/thp.c (modified) (3 diffs)

src/common_thp.cpp

@@ -42 +42 @@
     : dbus(dbus_engine), thp(NULL),
     last_getservices(0),
-    running(false)
+    running(false),
+    reconnect_thp(false)
 {
 }
@@ -54 +55 @@
 {
     thp_engine_check_fd(thp, rfds, wfds);
+    if (reconnect_thp && reconnect() == ERROR_NO_ERROR)
+        reconnect_thp = false;
 }
 
@@ -83 +86 @@
 }
 
-void wimax_thp::reconnect()
+int wimax_thp::reconnect()
 {
     wimax_debug("disconnecting\n");
+    int sockfd = thp_engine_get_fd(thp);
     thp_engine_free(thp);
-    int sockfd = thp_engine_get_fd(thp);
     FD_CLR(sockfd, saved_rfds);
     sleep(3);
     running = false;
 
-    if (connect(networkInterface.c_str(), saved_sockmax, saved_rfds) != ERROR_NO_ERROR)
+    if (connect(networkInterface.c_str(), saved_sockmax, saved_rfds) != ERROR_NO_ERROR) {
         wimax_warn("Could not reconnect to THP");
-    else
+        return -ERROR_FAILURE;
+    } else {
         wimax_debug("Reconnected to THP\n");
+        return ERROR_NO_ERROR;
+    }
 }
 

src/common_thp.h

@@ -35 +35 @@
     void check_fd(fd_set *rfds, fd_set *wfds);
     int connect(const std::string &interface, int *sockmax, fd_set *rfds);
-    void reconnect();
+    int reconnect();
     virtual int handle(const char *name, uint8_t *ptr, size_t length);
     virtual int handle_ack(uint16_t ack_nb) { return ERROR_NO_ERROR; };
@@ -49 +49 @@
     int handle_log(uint8_t *ptr, size_t length);
     int send(uint8_t *data, size_t length, uint16_t *seq_nb = NULL);
-
-protected:
     wimax_ms_dbus *dbus;
     std::string networkInterface;
+    bool reconnect_thp;
 
 private:

src/ms_thp.cpp

@@ -201 +201 @@
         status, error, rxbytes);
     if (state == BFH_STATE_START_APPLI)
-        reconnect();
+        reconnect_thp = true;
     return ERROR_NO_ERROR;
 }

src/wimax/thp.c

@@ -114 +114 @@
     engine->services[0].title = strdup("GetServices");
     engine->services[0].id = 1;
-
     return engine;
 }
@@ -126 +125 @@
     pcap_close(engine->pcap_handle);
     free(engine);
+    engine = NULL;
 }
 
@@ -337 +337 @@
     static int fragbuffer_index = 0;
 
+    if (!engine || !ptr)
+        return -ERROR_FAILURE;
+
     if (length < sizeof(*transport))
     {