fix #44 handle fin packet, remove slot quickly

Author: hoterran

packet.c

@@ -104,7 +104,7 @@ start_packet(MysqlPcap *mp) {
     ASSERT(ret >= 0);
 
     snprintf(mp->filter, sizeof(mp->filter),
-        "tcp port %d and tcp[tcpflags] & (tcp-push|tcp-ack) != 0", mp->mysqlPort);
+        "tcp port %d and tcp[tcpflags] & (tcp-push|tcp-ack|tcp-fin) != 0", mp->mysqlPort);
 
     if (pcap_compile(mp->pd, &fcode, mp->filter, 0, mp->netmask) < 0) {
         dump(L_ERR, "pcap_compile failed: %s", pcap_geterr(mp->pd));
@@ -302,9 +302,14 @@ process_ip(MysqlPcap *mp, const struct ip *ip, struct timeval tv) {
 #endif
         ASSERT((sport > 0) && (dport > 0));
 
-        // Capture only "data" packets, ignore TCP control
-        if (datalen == 0)
+        /*  sack datalen > 0 continue
+            fin possible ack = 1 continue
+            only filter pure ack packet
+        */
+        if ((tcp->ack) && (datalen == 0) && (!tcp->fin)) {
+            dump(L_DEBUG, "skip a packet");
             break;
+        }
         /*
          * for loopback, dst & src are all local_address
          * so use port to distinguish
@@ -317,7 +322,8 @@ process_ip(MysqlPcap *mp, const struct ip *ip, struct timeval tv) {
         }
 
         char *data = (char*) ((uchar *) tcp + tcp->doff * 4);
-        dump(L_DEBUG, "is_in:%c-datalen:%d-tcp:%u [%u]-[%u]", incoming, datalen, ntohl(tcp->seq), dport,sport);
+        dump(L_DEBUG, "is_in:%c-datalen:%d-tcp:%u [%u]-[%u] [%d-%d-%d]", incoming, datalen, ntohl(tcp->seq), dport,sport
+            ,tcp->psh, tcp->ack, tcp->fin);
         addPacketInfo(incoming, datalen, ntohl(tcp->seq), dport,sport, data);
 
         if (incoming == '1') {
@@ -386,7 +392,6 @@ inbound(MysqlPcap *mp, char* data, uint32 datalen,
     uint32 sqlSaveLen = 0;
     uint32_t *tcp_seq = NULL;
 
-    ASSERT(datalen > 0);
     ASSERT(data);
     ASSERT(mp && mp->hash && mp->pd);
 
@@ -395,6 +400,14 @@ inbound(MysqlPcap *mp, char* data, uint32 datalen,
     lport = dport;
     rport = sport;
 
+    if (tcp->fin) {
+        ASSERT(datalen == 0);
+        dump(L_DEBUG, "fin");
+        hash_get_rem(mp->hash, dst, src, lport, rport);
+        return OK;
+    }
+    ASSERT(datalen > 0);
+
     status = hash_get_status(mp->hash, dst, src,
         lport, rport, &sql, &sqlSaveLen, &tcp_seq, &cmd);
 
@@ -548,7 +561,7 @@ inbound(MysqlPcap *mp, char* data, uint32 datalen,
 
             if (param_count != ERR) {
                 ASSERT(param_count >= 0);
-                ASSERT(100 > param_count);
+                ASSERT(1000 > param_count);
                 /* prepare cant find, param_type in payload */
                 if ((param_count > 0)
                     && (datalen < sizeof(param) - 200 )) {
@@ -708,6 +721,13 @@ outbound(MysqlPcap *mp, char *data, uint32 datalen,
     lport = sport;
     rport = dport;
 
+    if (tcp->fin) {
+        ASSERT(datalen == 0);
+        dump(L_DEBUG, "fin");
+        hash_get_rem(mp->hash, src, dst, lport, rport);
+        return OK;
+    }
+    ASSERT(datalen > 0);
     struct timeval tv2;
     time_t tv_t;
     struct tm *tm;
@@ -910,7 +930,7 @@ outbound(MysqlPcap *mp, char *data, uint32 datalen,
         if (ret == 0) {
             ASSERT(stmt_id > 0);
             ASSERT(param_count >= 0);
-            ASSERT(100 > param_count);
+            ASSERT(1000 > param_count);
             hash_set_param_count(mp->hash, src, dst,
                 lport, rport, stmt_id, param_count);
             dump(L_DEBUG, "prepare ok packet %d %d", stmt_id, param_count);

stat.c

@@ -27,7 +27,7 @@ void addPacketInfo(char incoming, uint32 datalen, uint32 tcp_seq,
     uint16 dport, uint16 sport, char* payload) {
     ASSERT(G_pos <= LAST_PACKETS_NUM);
     ASSERT((incoming == '1') || (incoming == '0'));
-    ASSERT((datalen > 0) && (dport > 0) && (sport > 0));
+    ASSERT((datalen >= 0) && (dport > 0) && (sport > 0));
 
     if (G_pos == LAST_PACKETS_NUM) {
         G_pos = 0;

test/Makefile

@@ -0,0 +1,78 @@
+#include <stdio.h>
+#include <mysql.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include "c.h"
+
+int main(int argc, char* argv[])
+{
+    MYSQL *mysql,*sock;
+    MYSQL_ROW row;
+    MYSQL_RES *result;
+
+    mysql = mysql_init(NULL);
+    if (!(sock = CONN(CLIENT_MULTI_STATEMENTS))) {
+        fprintf(stderr, "Couldn't connect to engine!\n%s\n\n", mysql_error(mysql));
+        perror("");
+        exit(1);
+    }
+
+    // simple 
+    char sql[100] = {};
+
+    sprintf(sql, "INSERT INTO blob_test(a, b) VALUE (1, 2)");
+
+    mysql_query(sock, sql);
+
+    mysql_query(sock, "select * from blob_test");
+    
+    result = mysql_store_result(mysql);
+    mysql_free_result(result);
+
+    //prepare
+
+    MYSQL_STMT    *stmt;
+    MYSQL_BIND    bind[2];
+    my_ulonglong  affected_rows;
+    int           param_count;
+    short         small_data;
+    int           int_data;
+    char          str_data[1000];
+    unsigned long str_length;
+    my_bool       is_null;
+
+    stmt = mysql_stmt_init(mysql);
+
+    sprintf(sql, "INSERT INTO blob_test(a, b) VALUE (?, ?)");
+    mysql_stmt_prepare(stmt, sql, strlen(sql));
+
+    memset(bind, 0, sizeof(bind));
+
+    /* INTEGER PARAM */
+    /* This is a number type, so there is no need to specify buffer_length */
+    bind[0].buffer_type= MYSQL_TYPE_LONG;
+    bind[0].buffer= (char *)&int_data;
+    bind[0].is_null= 0;
+
+    /* STRING PARAM */
+    my_bool a = 1;
+    bind[1].buffer_type= MYSQL_TYPE_BLOB;
+    bind[1].buffer= (char *)str_data;
+    bind[1].is_null= &a;
+    bind[1].length= &str_length;        //实际大小, bind_
+
+    mysql_stmt_bind_param(stmt, bind);
+
+    /* Specify the data values for the first row -------------------------------------------------- */
+    int_data= 10;             /* integer */
+    strncpy(str_data, "MySQL", 1000); /* string  */
+    str_length= strlen(str_data);
+
+    mysql_stmt_execute(stmt);
+
+    mysql_stmt_close(stmt);
+
+    return 0;
+}
+