添加smtp、mqtt

编译通过，待调试

pro/CMakeLists.txt

@@ -75,8 +75,6 @@ set(PDU_SRC_LIST
     ${PROJECT_SOURCE_DIR}/src/cascade_slave.c
 	${PROJECT_SOURCE_DIR}/src/upg.c
 	${PROJECT_SOURCE_DIR}/src/file.c
-	${PROJECT_SOURCE_DIR}/src/smtp.c
-	${PROJECT_SOURCE_DIR}/src/mqtt.c
 	${PROJECT_SOURCE_DIR}/src/netswitch.c
 	${PROJECT_SOURCE_DIR}/src/main.c
 
@@ -97,7 +95,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${NO_WARNNING_FLAGS} -Werror")
 
 
 add_executable(smartPDU ${PDU_SRC_LIST})
-target_link_libraries(smartPDU -lpcre -lsqlite3 -lssl -lcrypto -lmodbus -lc -ldl -lpthread -lnetsnmp -lnetsnmpagent -lrt)
+target_link_libraries(smartPDU -lpcre -lsqlite3 -lmodbus -lc -ldl -lpthread -lnetsnmp -lnetsnmpagent -lrt)
 
 
 set(SRC_DIR ${PROJECT_BINARY_DIR})

pro/src/mqtt.c

@@ -1,231 +0,0 @@
-#include "mqtt.h"
-#include "thread.h"
-#include "mongoose.h"
-#include "elog.h"
-
-#if 1
-    #define LOGD            log_d
-    #define LOGE            log_e
-    #define LOGW            log_w
-#else
-    #define LOGD            printf
-    #define LOGE            printf
-    #define LOGW            printf
-#endif
-
-#define MQTT_SERVER_URL     "XXXXXXXX"
-
-typedef struct mg_mgr mgr_t;
-typedef struct mg_mqtt_opts mg_opts_t;
-typedef struct mg_connection mg_conn_t;
-typedef struct {
-    mgr_t         mgr;
-    mg_opts_t     opts;
-    mg_conn_t     *conn;
-    conn_para_t   para;
-    
-    pthread_mutex_t mutex;
-    int           inited;
-    bool          isover;
-    
-}mqtt_handle_t;
-static mqtt_handle_t mqHandle;
-
-static void mqtt_fn(struct mg_connection *c, int ev, void *ev_data)
-{
-    mqtt_handle_t *h=&mqHandle;
-    
-    if (ev == MG_EV_OPEN) {
-        // c->is_hexdumping = 1;
-    } else if (ev == MG_EV_CONNECT) {
-        if (mg_url_is_ssl(h->para.url)) {
-            struct mg_tls_opts opts = {.ca = mg_unpacked("/certs/ca.pem"),
-                                     .name = mg_url_host(h->para.url)};
-            mg_tls_init(c, &opts);
-        }
-    } else if (ev == MG_EV_ERROR) {
-        // On error, log error message
-        MG_ERROR(("%p %s", c->fd, (char *) ev_data));
-    } else if (ev == MG_EV_MQTT_OPEN) {
-        
-    } else if (ev == MG_EV_MQTT_MSG) {
-        // When we receive MQTT message, print it
-        struct mg_mqtt_message *mm = (struct mg_mqtt_message *) ev_data;
-        MG_INFO(("Received on %.*s : %.*s", (int) mm->topic.len, mm->topic.buf,
-             (int) mm->data.len, mm->data.buf));
-    } else if (ev == MG_EV_POLL && c->data[0] == 'X') {
-        
-    }
-
-    if (ev == MG_EV_ERROR || ev == MG_EV_CLOSE) {
-        MG_INFO(("Got event %d, stopping...", ev));
-        *(bool *) c->fn_data = true;  // Signal that we're done
-    }
-}
-static void* mqtt_thread(void *arg)
-{
-    int r;
-    thread_handle_t *h=(thread_handle_t*)arg;
-    mqtt_handle_t   *mh=(mqtt_handle_t*)h->arg;
-    
-    while(h->quit==0) {
-        pthread_mutex_lock(&mh->mutex);
-        if (mh->isover) {
-            mh->conn = mg_mqtt_connect(&mh->mgr, mh->para.url, &mh->opts, mqtt_fn, &mh->isover);
-        }
-        else {
-            mg_mgr_poll(&mh->mgr, 300);
-        }
-        pthread_mutex_unlock(&mh->mutex);
-        
-        if(mh->isover) usleep(1000);
-    }
-    pthread_exit(NULL);
-}
-//////////////////////////////////////////////////////////////////////////
-int mqtt_init(void)
-{
-    int r;
-    mqtt_handle_t *h=&mqHandle;
-    
-    memset(h, 9, sizeof(mqtt_handle_t));
-    mg_mgr_init(&h->mgr);
-    
-    h->para.ver = 4;
-    h->para.qos = 1;
-    strcpy(h->para.url, MQTT_SERVER_URL);
-    
-    r = pthread_mutex_init(&h->mutex, NULL);
-    if(r) {
-        LOGE("___ mqtt mutex init failed\n");
-        return -1;
-    }
-    
-    thread_start(THREAD_ID_MQTT, mqtt_thread, h, 4*MB, 0);
-    h->inited = 1;
-    
-    return 0;
-}
-
-
-int mqtt_deinit(void)
-{
-    mqtt_handle_t *h=&mqHandle;
-    
-    thread_stop(THREAD_ID_MQTT);
-    mg_mgr_free(&h->mgr);
-    pthread_mutex_destroy(&h->mutex);
-    h->inited = 0;
-    
-    return 0;
-}
-
-int mqtt_set(conn_para_t *para)
-{
-    mqtt_handle_t *h=&mqHandle;
-    
-    if(!para || para->ver<3 || para->ver>5) {
-        return -1;
-    }
-    h->para = *para;
-    
-    return 0;
-}
-
-
-int mqtt_conn(void)
-{
-    mqtt_handle_t *h=&mqHandle;
-    
-    pthread_mutex_lock(&h->mutex);
-    if(!h->inited) {
-        goto quit;
-    }
-    
-    memset(&h->opts, 0, sizeof(h->opts));
-    h->opts.clean = true,
-    h->opts.qos = h->para.qos,
-    h->opts.topic = mg_str(""),
-    h->opts.version = h->para.ver,
-    h->opts.message = mg_str("bye");
-    
-    if(h->conn) {
-        mg_mqtt_disconnect(h->conn, NULL);
-    }
-    
-    h->isover = false;
-    h->conn = mg_mqtt_connect(&h->mgr, h->para.url, &h->opts, mqtt_fn, &h->isover);
-    
-quit:
-    pthread_mutex_unlock(&h->mutex);
-    return h->conn?0:-1;
-}
-
-
-int mqtt_disconn(void)
-{
-    int r=0;
-    mqtt_handle_t *h=&mqHandle;
-
-    pthread_mutex_lock(&h->mutex);
-    if(!h->inited) {
-        r = -1;
-        goto quit;
-    }
-    mg_mqtt_disconnect(h->conn, NULL);
-    
-quit:
-    pthread_mutex_unlock(&h->mutex);
-    return r;
-}
-
-
-int mqtt_sub(char *topic, int qos)
-{
-    int r=0;
-    mg_opts_t opts;
-    mqtt_handle_t *h=&mqHandle;
-
-    pthread_mutex_lock(&h->mutex);
-    if(!h->inited || !h->conn) {
-        r = -1;
-        goto quit;
-    }
-    
-    memset(&opts, 0, sizeof(opts));
-    opts.topic = mg_str(topic);
-    opts.qos = qos;
-    mg_mqtt_sub(h->conn, &opts);
-    
-quit:
-    pthread_mutex_unlock(&h->mutex);
-    return r;
-}
-
-
-int mqtt_pub(char *topic, int qos, char *data, int dlen)
-{
-    int r=0;
-    mg_opts_t opts;
-    mqtt_handle_t *h=&mqHandle;
-
-    pthread_mutex_lock(&h->mutex);
-    if(!h->inited || !h->conn) {
-        r = -1;
-        goto quit;
-    }
-    
-    memset(&opts, 0, sizeof(opts));
-    opts.topic = mg_str(topic);
-    opts.qos = qos;
-    opts.message.buf = data;
-    opts.message.len = dlen;
-    opts.retain = false;
-    mg_mqtt_pub(h->conn, &opts);
-    
-quit:
-    pthread_mutex_unlock(&h->mutex);
-    return r;
-}
-
-

pro/src/mqtt.h

@@ -1,25 +0,0 @@
-#ifndef __MQTT_Hx__
-#define __MQTT_Hx__
-
-#include <stdint.h>
-
-
-typedef struct {
-    uint8_t qos;
-    uint8_t ver;
-    uint8_t clean;
-    char    url[1024];
-}conn_para_t;
-
-
-int mqtt_init(void);
-int mqtt_deinit(void);
-
-int mqtt_set(conn_para_t *para);
-int mqtt_conn(void);
-int mqtt_disconn(void);
-
-int mqtt_sub(char *topic, int qos);
-int mqtt_pub(char *topic, int qos, char *data, int dlen);
-
-#endif

pro/src/netswitch.c

@@ -20,12 +20,7 @@
 #define SW_HOST_IP          "192.168.0.1"
 #define NETSNMP_DS_APP_DONT_FIX_PDUS 0
 
-typedef struct {
-    netswitch_data_t sw;
-    netswitch_data_t sw2;
-    int              port_start;         
-}ns_handle_t;
-static ns_handle_t nsHandle;
+
 
 ////////////////////////////////////////////////////////////////////////
 
@@ -372,7 +367,6 @@ static int sw_get(netswitch_data_t *sw)
     char temp[100];
     netswitch_data_t tmp;
     netsnmp_variable_list *var,*pvar;
-    ns_handle_t *h=&nsHandle;
 
     char *dot1dTpFdbEntryOid="1.3.6.1.2.1.17.4.3.1";
     var = snmp_getbulk(SNMP_VERSION_2c, "public", SW_HOST_IP, dot1dTpFdbEntryOid);
@@ -400,7 +394,7 @@ static int sw_get(netswitch_data_t *sw)
                     char *p=strstr(pstr, tok_id);
                     if(p) {
                         p += strlen(tok_id);
-                        tmp.port[j].id = atoi(p) - h->port_start;
+                        tmp.port[j].id = atoi(p) - SW_PORT_START;
                         j++;
                     }
                 }
@@ -470,7 +464,7 @@ static int sw_get(netswitch_data_t *sw)
 
     char *ifEntry="1.3.6.1.2.1.2.2.1.8";
     for(i=0; i<SW_PORT_MAX; i++) {
-        sprintf(temp, "%s.%d", ifEntry, i+h->port_start);
+        sprintf(temp, "%s.%d", ifEntry, i+SW_PORT_START);
         var = snmp_get(SNMP_VERSION_2c, "public", SW_HOST_IP, temp);
         if(var) {
             int id;
@@ -484,7 +478,7 @@ static int sw_get(netswitch_data_t *sw)
                     p = strstr(pstr, tok_ifo);
                     if(p) {  //ip addr
                         p += strlen(tok_ifo);
-                        id = atoi(p) - h->port_start;
+                        id = atoi(p)-SW_PORT_START;
                         if(strstr(p, "up")) {
                             sw->port[id].up = 1;
                         }
@@ -608,24 +602,23 @@ static int sw_alarm(netswitch_evts_t *evts, netswitch_data_t *old, netswitch_dat
 }
 
 
-
+static netswitch_data_t sw,sw2;
 static void* sw_thread(void *arg)
 {
     int r;
     netswitch_evts_t   evts;
     thread_handle_t    *h=(thread_handle_t*)arg;
-    ns_handle_t        *nh=(ns_handle_t*)h->arg;
-    sqlite3 *db=get_db();
+    sqlite3 *db=get_db();;
 
-    dev_switch_init(db, &nh->sw);
-    nh->sw2 = nh->sw;
+    dev_switch_init(db, &sw);
+    sw2 = sw;
 
     SOCK_STARTUP;
     while(h->quit==0) {
-        r = sw_get(&nh->sw);
-        if(r==0 && sw_chk(&nh->sw, &nh->sw2, &evts)) {
-            sw_alarm(&evts, &nh->sw, &nh->sw2);
-            sw_cpy(&nh->sw, &nh->sw2);
+        r = sw_get(&sw);
+        if(r==0 && sw_chk(&sw, &sw2, &evts)) {
+            sw_alarm(&evts, &sw, &sw2);
+            sw_cpy(&sw, &sw2);
         }
         usleep(1000);
     }
@@ -636,10 +629,7 @@ static void* sw_thread(void *arg)
 
 int netswitch_init(void)
 {
-    ns_handle_t *h=&nsHandle;
-    
-    h->port_start = SW_PORT_START;
-    thread_start(THREAD_ID_SWITCH, sw_thread, h, 10*MB, 0);
+    thread_start(THREAD_ID_SWITCH, sw_thread, NULL, 10*MB, 0);
     
     return 0;
 }
@@ -654,12 +644,10 @@ int netswitch_deinit(void)
 
 int netswitch_get(netswitch_data_t *data)
 {
-    ns_handle_t *h=&nsHandle;
-    
     if(!data) {
         return -1;
     }
-    *data = h->sw;
+    *data = sw;
 
     return 0;
 }

pro/src/smtp.h

@@ -1,28 +0,0 @@
-#ifndef __SMTP_H__
-#define __SMTP_H__
-
-#include <stdint.h>
-
-typedef struct {
-    char server[128];
-    char port[10];
-    
-    char user[128];
-    char passwd[128];
-    
-    char name_fr[128];
-    char mail_fr[128];
-    
-    char name_to[128];
-    char mail_to[128];
-    
-    char subject[128];
-    int  bodylen;
-    char *body;
-}smtp_data_t;
-
-
-int smtp_send(smtp_data_t *sd);
-
-#endif /* SMTP_H */
-

pro/src/thread.h

@@ -26,7 +26,6 @@ enum {
     THREAD_ID_SHMW,
     THREAD_ID_BREAKER,
     THREAD_ID_SWITCH,
-    THREAD_ID_MQTT,
     
     THREAD_ID_MAX=30
 };