update mqttd main.c, fix debug with java bug for JSON with \0 bug

guowenxue

2019-08-03 2f6051f61e62ac477622f02708cb8eb13bc0ca51

 mqttd/main.c

@@ -29,6 +29,10 @@
#define PROG_VERSION               "v1.0.0"
#define DAEMON_PIDFILE             "/tmp/.mqtt.pid"

#define FLAG_DETECTD        (1<<0)
#define FLAG_RELAYON        (1<<1)
int g_breakin_flag = 0;  /* relay already turn on and wait to off  */

int check_set_program_running(int daemon);
void *mqtt_sub_worker(void *args);
void *mqtt_pub_worker(void *args);
@@ -49,6 +53,16 @@
    return;
}

void turn_light_off(int signum)
{
    if( g_breakin_flag&FLAG_RELAYON ) 
    {
        log_nrml("fill-in light timeout and turn light off now\n");
        turn_relay(OFF);
    }

    g_breakin_flag = 0;
}

int main (int argc, char **argv)
{
@@ -61,6 +75,7 @@
    int                debug = 0;
    int                opt;
    char              *progname=NULL;
    double             lux = 0.0;

    struct option long_options[] = {
        {"conf", required_argument, NULL, 'c'},
@@ -121,6 +136,12 @@

    install_proc_signal();

    if( ctx.hwconf.fillin_light )
    {
        log_nrml("Install inbreak detected fill-in light off signal\n");
        signal(SIGALRM, turn_light_off);
    }

    if( check_set_program_running(daemon) < 0 ) 
        goto OUT;

@@ -140,10 +161,54 @@
    }
    log_nrml("Start MQTT publisher worker thread ok\n");


    while( ! g_signal.stop )
    {
        msleep(1000);

        if( ctx.hwconf.infrared_pin && !g_breakin_flag )
        {
            //log_nrml("infrared dected human incoming\n");
            if( infrared_detect(1000) )
            {
                log_nrml("Someone incoming detected by infrared\n");
                g_breakin_flag |= FLAG_DETECTD; 
                
                /* setup alarm to turn relay off or clear the flag */
                alarm(ctx.hwconf.light_intval);

                if( ctx.hwconf.inbreak_beep )
                {
                    turn_beep(ctx.hwconf.beep_times);
                }

                if( ctx.hwconf.fillin_light==FILLIN_LIGHT_ON && !g_breakin_flag )
                {
                    log_nrml("Force fill-in light on and will be off in [%d] seconds\n", ctx.hwconf.light_intval);
                    turn_relay(ON);
                    g_breakin_flag |= FLAG_RELAYON;
                }
                else if( ctx.hwconf.fillin_light==FILLIN_LIGHT_AUTO && ctx.hwconf.lux )
                {
                    lux = tsl2561_get_lux(); 
                    log_nrml("TSL2516 detect illumination intensity %.3flux and threshold %.3flux\n", 
                            lux, ctx.hwconf.lux_threshold);

                    /* only lux<0.01 will turn on light */
                    if( lux-0.001 > ctx.hwconf.lux_threshold)
                    {
                        log_nrml("Illumination intensity enuf, no need fill-in light\n");
                    }
                    else
                    {
                        log_nrml("Auto fill-in light on and will be off in [%d] seconds\n", ctx.hwconf.light_intval);
                        turn_relay(ON);
                        g_breakin_flag |= FLAG_RELAYON;
                    }
                }

            }
        
        }
        //log_nrml("Main control thread continue running\n");
    }

@@ -154,7 +219,6 @@
    
    return 0;
} /* ----- End of main() ----- */


int check_set_program_running(int daemon)
{
@@ -190,7 +254,8 @@
    mqtt_ctx_t             *ctx = (mqtt_ctx_t *)userdata;
    int                     rv = 0;
    char                    msg[128];  
    float                   temp = 0.0;
    float                   temp = 0.0; /* temperature */
    float                   rh = 0.0;   /* relative humidity */
    int                     retain = 0;

    if( result )
@@ -210,7 +275,7 @@
        else 
            snprintf(msg, sizeof(msg), "{ \"id\":%s, \"temp\":\"%.2f\" }", ctx->id, temp);

        rv = mosquitto_publish(mosq, NULL, ctx->pubTopic, strlen(msg)+1, msg, ctx->pubQos, retain);
        rv = mosquitto_publish(mosq, NULL, ctx->pubTopic, strlen(msg), msg, ctx->pubQos, retain);
        if( rv )
        {
            log_err("Publisher broadcast message '%s' failure: %d\n", msg, rv);
@@ -220,6 +285,27 @@
            log_nrml("Publisher broadcast message '%s' ok\n", msg);
        }
    }

    if( ctx->hwconf.sht2x )
    {
        memset(msg, 0, sizeof(msg));
        
        if( sht2x_get_temp_humidity(&temp, &rh) < 0 )
            snprintf(msg, sizeof(msg), "{ \"id\":%s, \"temp\":\"error\", \"RH\":\"error\" }", ctx->id);
        else 
            snprintf(msg, sizeof(msg), "{ \"id\":%s, \"temp\":\"%.2f\", \"RH\":\"%.2f\" }", ctx->id, temp, rh);

        rv = mosquitto_publish(mosq, NULL, ctx->pubTopic, strlen(msg), msg, ctx->pubQos, retain);
        if( rv )
        {
            log_err("Publisher broadcast message '%s' failure: %d\n", msg, rv);
        }
        else 
        {
            log_nrml("Publisher broadcast message '%s' ok\n", msg);
        }
    }

    
    log_nrml("Publisher broadcast over and disconnect broker now\n", ctx->host, ctx->port); 
    mosquitto_disconnect(mosq);
@@ -359,7 +445,7 @@
            value = cJSON_Print(item);

            /* light controled by relay */
            if( hwconf->relay && !strcasecmp(item->string, "light") )
            if( hwconf->relay_pin && !strcasecmp(item->string, "light") )
            {
                if( strcasestr(value, "on") )
                {
@@ -374,15 +460,11 @@
            }

            /* buzzer */
            if( hwconf->beep && !strcasecmp(item->string, "buzzer") )
            if( hwconf->beep_pin && !strcasecmp(item->string, "buzzer") )
            {
                if( strcasestr(value, "on") )
                {
                    log_nrml("Turn buzzer on\n");
                }
                else if( strcasestr(value, "music") )
                {
                    log_nrml("Turn buzzer play music\n");
                    log_nrml("Turn buzzer on [%d] times\n", hwconf->beep_times);
                }
            }