Skip to content

Commit cdb54f4

Browse files
sharky76sharky76
committed
some changes
1 parent d946d39 commit cdb54f4

File tree

11 files changed

+64
-42
lines changed

11 files changed

+64
-42
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ ALL_OBJ=$(OUTDIR)/Conditional.o $(OUTDIR)/Expression.o \
5656
$(OUTDIR)/zwave-automation-engine.o -l:libreadline.a -l:libncurses.a \
5757
-lrt
5858

59-
COMPILE=/home/alex/pidev/pitools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-gcc -c -x c "-D_GNU_SOURCE" -g -std=c99 -o "$(OUTDIR)/$(*F).o" $(CFG_INC) $<
59+
COMPILE=/home/alex/pidev/pitools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-gcc -c -x c "-D_GNU_SOURCE" -g -rdynamic -std=c99 -o "$(OUTDIR)/$(*F).o" $(CFG_INC) $<
6060
LINK=/home/alex/pidev/pitools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-gcc -g -LlibZaeUtil/Debug -lZaeUtil -L/home/alex/pidev/pitools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/arm-linux-gnueabihf/libc/lib/arm-linux-gnueabihf -L../z-way-devel/lib -lzway -lzcommons -lpthread -lxml2 -lz -lm -lcrypto -larchive -llzma -lnettle -lacl -lattr -llzo2 -lbz2 -lcurl -ljson-c -ldl -o "$(OUTFILE)" $(ALL_OBJ)
6161

6262
# Pattern rules

‎libZaeUtil/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ ALL_OBJ=$(OUTDIR)/base64.o $(OUTDIR)/cli.o $(OUTDIR)/curl_util.o \
3636
-L/home/alex/pidev/pitools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/arm-linux-gnueabihf/libc/lib/arm-linux-gnueabihf \
3737
-lpthread -lcurl -ljson-c
3838

39-
COMPILE=/home/alex/pidev/pitools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-gcc -c -x c "-D_GNU_SOURCE" -g -fPIC -std=c99 -o "$(OUTDIR)/$(*F).o" $(CFG_INC) $<
39+
COMPILE=/home/alex/pidev/pitools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-gcc -c -x c "-D_GNU_SOURCE" -g -rdynamic -fPIC -std=c99 -o "$(OUTDIR)/$(*F).o" $(CFG_INC) $<
4040
LINK=/home/alex/pidev/pitools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-gcc -g -shared -fPIC -o "$(OUTFILE)" $(ALL_OBJ)
4141

4242
# Pattern rules

‎libZaeUtil/crc32.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,5 +98,5 @@ crc32(uint32_t crc, const void *buf, size_t size)
9898
while (size--)
9999
crc = crc32_tab[(crc ^ *p++) & 0xFF] ^ (crc >> 8);
100100

101-
return crc ^ ~0U;
101+
return crc ^ ~0U;
102102
}

‎libZaeUtil/curl_util.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ void curl_util_get_json(const char* request_url, void (response_parser)(const
5353
field, so we provide one */
5454
curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "libcurl-agent/1.0");
5555

56+
curl_easy_setopt(curl_handle, CURLOPT_TIMEOUT, 30);
57+
5658
//curl_easy_setopt(curl_handle, CURLOPT_TIMEOUT, 4L);
5759
/* get it! */
5860
res = curl_easy_perform(curl_handle);

‎services/Mail/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ COMMON_OBJ=$(OUTDIR)/Mail.o $(OUTDIR)/mail_cli.o \
2929
OBJ=$(COMMON_OBJ) $(CFG_OBJ)
3030
ALL_OBJ=$(OUTDIR)/Mail.o $(OUTDIR)/mail_cli.o $(OUTDIR)/mail_data.o
3131

32-
COMPILE=/home/alex/pidev/pitools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-gcc -c "-D_GNU_SOURCE" -g -fPIC -std=c99 -o "$(OUTDIR)/$(*F).o" $(CFG_INC) $<
32+
COMPILE=/home/alex/pidev/pitools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-gcc -c "-D_GNU_SOURCE" -g -rdynamic -fPIC -std=c99 -o "$(OUTDIR)/$(*F).o" $(CFG_INC) $<
3333
LINK=/home/alex/pidev/pitools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-gcc -g -shared -fPIC -L/pidev/pitools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/arm-linux-gnueabihf/lib -lcurl -ljson-c -o "$(OUTFILE)" $(ALL_OBJ)
3434

3535
# Pattern rules

‎services/SMS/sms_cli.c

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,19 @@ char** sms_cli_get_config()
5656

5757
char buf[128] = {0};
5858
carrier_data_t* carrier_data = sms_data_get_carrier();
59-
snprintf(buf, 127, "country-code %s carrier %s", carrier_data->country_code, carrier_data->carrier);
60-
config_list[0] = strdup(buf);
6159

62-
phone_table_visitor_t data = {
63-
.config_list = config_list,
64-
.start_index = 1
65-
};
66-
67-
variant_hash_for_each_value(phone_table, const char*, add_to_config_list_visitor, &data);
60+
if(carrier_data->carrier != NULL)
61+
{
62+
snprintf(buf, 127, "country-code %s carrier %s", carrier_data->country_code, carrier_data->carrier);
63+
config_list[0] = strdup(buf);
64+
65+
phone_table_visitor_t data = {
66+
.config_list = config_list,
67+
.start_index = 1
68+
};
69+
70+
variant_hash_for_each_value(phone_table, const char*, add_to_config_list_visitor, &data);
71+
}
6872

6973
return config_list;
7074
}

‎services/Timer/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ ALL_OBJ=$(OUTDIR)/Timer.o $(OUTDIR)/timer_cli.o \
3030
-L../../libZaeUtil/Debug -lZaeUtil \
3131
-L/home/alex/pidev/pitools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/arm-linux-gnueabihf/libc/lib/arm-linux-gnueabihf
3232

33-
COMPILE=/home/alex/pidev/pitools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-gcc -c -x c "-D_GNU_SOURCE" -g -fPIC -std=c99 -o "$(OUTDIR)/$(*F).o" $(CFG_INC) $<
33+
COMPILE=/home/alex/pidev/pitools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-gcc -c -x c "-D_GNU_SOURCE" -g -rdynamic -fPIC -std=c99 -o "$(OUTDIR)/$(*F).o" $(CFG_INC) $<
3434
LINK=/home/alex/pidev/pitools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-gcc -g -shared -fPIC -o "$(OUTFILE)" $(ALL_OBJ)
3535

3636
# Pattern rules

‎vdev/SurveillanceStation/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ OBJ=$(COMMON_OBJ) $(CFG_OBJ)
2929
ALL_OBJ=$(OUTDIR)/SS_api.o $(OUTDIR)/SurveillanceStation.o \
3030
$(OUTDIR)/SurveillanceStation_cli.o
3131

32-
COMPILE=/home/alex/pidev/pitools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-gcc -c -x c "-D_GNU_SOURCE" -g -fPIC -std=c99 -o "$(OUTDIR)/$(*F).o" $(CFG_INC) $<
32+
COMPILE=/home/alex/pidev/pitools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-gcc -c -x c "-D_GNU_SOURCE" -g -fPIC -std=c99 -rdynamic -o "$(OUTDIR)/$(*F).o" $(CFG_INC) $<
3333
LINK=/home/alex/pidev/pitools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-gcc -g -shared -fPIC -L/pidev/pitools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/arm-linux-gnueabihf/lib -lcurl -ljson-c -o "$(OUTFILE)" $(ALL_OBJ)
3434

3535
# Pattern rules
@@ -73,7 +73,7 @@ OBJ=$(COMMON_OBJ) $(CFG_OBJ)
7373
ALL_OBJ=$(OUTDIR)/SS_api.o $(OUTDIR)/SurveillanceStation.o \
7474
$(OUTDIR)/SurveillanceStation_cli.o
7575

76-
COMPILE=/home/alex/pidev/pitools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-gcc -c -x c "-D_GNU_SOURCE" -fPIC -std=c99 -o "$(OUTDIR)/$(*F).o" $(CFG_INC) $<
76+
COMPILE=/home/alex/pidev/pitools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-gcc -c -x c "-D_GNU_SOURCE" -fPIC -std=c99 -rdynamic -o "$(OUTDIR)/$(*F).o" $(CFG_INC) $<
7777
LINK=/home/alex/pidev/pitools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-gcc -shared -fPIC -L/pidev/pitools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/arm-linux-gnueabihf/lib -lcurl -ljson-c -o "$(OUTFILE)" $(ALL_OBJ)
7878

7979
# Pattern rules

‎vdev/SurveillanceStation/SS_api.c

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ void process_query_response(const json_object* obj)
4646
free(SS_auth_path);
4747
SS_auth_path = strdup(json_object_get_string(auth_path_data));
4848
LOG_DEBUG(DT_SURVEILLANCE_STATION, "SYNO.Api.Auth path = %s", SS_auth_path);
49-
json_object_put(auth_path_data);
49+
//json_object_put(auth_path_data);
5050
}
5151

52-
json_object_put(auth_data);
52+
//json_object_put(auth_data);
5353
}
5454

5555
struct json_object* event_data;
@@ -63,11 +63,10 @@ void process_query_response(const json_object* obj)
6363
free(SS_event_path);
6464
SS_event_path = strdup(json_object_get_string(event_path_data));
6565
LOG_DEBUG(DT_SURVEILLANCE_STATION, "SYNO.SurveillanceStation.Event path = %s", SS_event_path);
66-
67-
json_object_put(event_path_data);
66+
//json_object_put(event_path_data);
6867
}
6968

70-
json_object_put(event_data);
69+
//json_object_put(event_data);
7170
}
7271

7372
struct json_object* camera_data;
@@ -81,10 +80,10 @@ void process_query_response(const json_object* obj)
8180
free(SS_camera_path);
8281
SS_camera_path = strdup(json_object_get_string(camera_path_data));
8382
LOG_DEBUG(DT_SURVEILLANCE_STATION, "SYNO.SurveillanceStation.Camera path = %s", SS_camera_path);
84-
json_object_put(camera_path_data);
83+
//json_object_put(camera_path_data);
8584
}
8685

87-
json_object_put(camera_data);
86+
//json_object_put(camera_data);
8887
}
8988

9089
struct json_object* info_data;
@@ -98,17 +97,17 @@ void process_query_response(const json_object* obj)
9897
free(SS_info_path);
9998
SS_info_path = strdup(json_object_get_string(info_path_data));
10099
LOG_DEBUG(DT_SURVEILLANCE_STATION, "SYNO.SurveillanceStation.Info path = %s", SS_info_path);
101-
json_object_put(info_path_data);
100+
//json_object_put(info_path_data);
102101
}
103102

104-
json_object_put(info_data);
103+
//json_object_put(info_data);
105104
}
106105

107-
json_object_put(query_data_array);
106+
//json_object_put(query_data_array);
108107
}
109108
}
110109

111-
json_object_put(success_response);
110+
//json_object_put(success_response);
112111
}
113112
}
114113

@@ -141,13 +140,13 @@ void process_auth_response(const json_object* obj)
141140
free(SS_auth_sid);
142141
SS_auth_sid = strdup(json_object_get_string(sid_value));
143142
LOG_DEBUG(DT_SURVEILLANCE_STATION, "Auth SID = %s", SS_auth_sid);
144-
json_object_put(sid_value);
143+
//json_object_put(sid_value);
145144
}
146145
}
147-
json_object_put(sid_object);
146+
//json_object_put(sid_object);
148147
}
149148

150-
json_object_put(success_response);
149+
//json_object_put(success_response);
151150
}
152151
}
153152

@@ -203,13 +202,13 @@ void process_get_info_response(const json_object* obj)
203202
if(TRUE == json_object_object_get_ex(data_object, "cameraNumber", &camera_num))
204203
{
205204
SS_camera_count = json_object_get_int(camera_num);
206-
json_object_put(camera_num);
205+
//json_object_put(camera_num);
207206
}
208-
json_object_put(data_object);
207+
//json_object_put(data_object);
209208
}
210209
}
211210

212-
json_object_put(success_response);
211+
//json_object_put(success_response);
213212
}
214213
}
215214
// http://192.168.1.77:5000/webapi/_______________________________________________________entry.cgi?api=SYNO.SurveillanceStation.Event&method=CountByCategory&reason=2,7&fromTime=1461931670&version=4&_sid=6f.rB6ZDs.i9QBCK3N02417
@@ -308,13 +307,13 @@ void process_motion_events_response(const json_object* obj)
308307
}
309308
}
310309
}
311-
json_object_put(evt_cam_object);
310+
//json_object_put(evt_cam_object);
312311
}
313-
json_object_put(data_object);
312+
//json_object_put(data_object);
314313
}
315314
}
316315

317-
json_object_put(success_response);
316+
//json_object_put(success_response);
318317
}
319318
}
320319

@@ -407,7 +406,7 @@ struct json_object* success_response;
407406
if(TRUE == json_object_object_get_ex(camera_entry, "id", &camera_id_object))
408407
{
409408
cam_id = json_object_get_int(camera_id_object);
410-
json_object_put(camera_id_object);
409+
//json_object_put(camera_id_object);
411410
}
412411

413412
struct json_object* camera_name_object;
@@ -432,15 +431,15 @@ struct json_object* success_response;
432431
}
433432
}
434433

435-
json_object_put(camera_name_object);
434+
//json_object_put(camera_name_object);
436435
}
437436
}
438-
json_object_put(camera_array);
437+
//json_object_put(camera_array);
439438
}
440-
json_object_put(data_object);
439+
//json_object_put(data_object);
441440
}
442441
}
443442

444-
json_object_put(success_response);
443+
//json_object_put(success_response);
445444
}
446445
}

‎vdev/SurveillanceStation/SurveillanceStation.vpj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
RunFromDir="%rw">
2626
<Exec
2727
CmdLine='/home/alex/pidev/pitools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-gcc -c %xup -x c %defd -g -fPIC %~other -o "%bd%n%oe" %i %f'
28-
OtherOptions="-std=c99"/>
28+
OtherOptions="-std=c99 -rdynamic"/>
2929
</Target>
3030
<Target
3131
Name="Link"
@@ -125,7 +125,7 @@
125125
RunFromDir="%rw">
126126
<Exec
127127
CmdLine='/home/alex/pidev/pitools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-gcc -c %xup -x c %defd -fPIC %~other -o "%bd%n%oe" %i %f'
128-
OtherOptions="-std=c99"/>
128+
OtherOptions="-std=c99 -rdynamic"/>
129129
</Target>
130130
<Target
131131
Name="Link"

‎zwave-automation-engine.c

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include "builtin_service_manager.h"
3131
#include <event.h>
3232
#include "vdev_manager.h"
33+
#include <execinfo.h>
3334

3435
#define DEFAULT_PORT 9231
3536

@@ -86,6 +87,21 @@ void sigpipe(int sig)
8687
//siglongjmp (jmpbuf, 1);
8788
}
8889

90+
void sigsegv(int sig) {
91+
void *array[100];
92+
size_t size;
93+
94+
// get void*'s for all entries on the stack
95+
size = backtrace(array, 100);
96+
97+
// print out all the frames to stderr
98+
//FILE* btfile = fopen("/tmp/zaebt", "w+");
99+
printf("Error: signal %d, btsize %d:\n", sig, size);
100+
backtrace_symbols_fd(array, size, 1);
101+
//fclose(btfile);
102+
exit(1);
103+
}
104+
89105
/* Signale wrapper for vtysh. We don't use sigevent because
90106
* vtysh doesn't use threads. TODO */
91107
void
@@ -111,6 +127,7 @@ void signal_init()
111127
//main_signal_set (SIGINT, sigint);
112128
//main_signal_set (SIGTSTP, sigtstp);
113129
main_signal_set (SIGPIPE, sigpipe);
130+
//signal(SIGSEGV, sigsegv);
114131
}
115132

116133
char* null_function(const char *ignore, int key)

0 commit comments

Comments
 (0)