Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
A
ademco_hb
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
captainwong
ademco_hb
Commits
14606367
Commit
14606367
authored
Sep 09, 2020
by
captainwong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
define _DEBUG to try catch
parent
f1e7fe8c
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
78 additions
and
0 deletions
+78
-0
Makefile
examples/Makefile
+73
-0
ademco_packet.h
include/ademco_packet.h
+5
-0
No files found.
examples/Makefile
0 → 100644
View file @
14606367
DEBUG
?=
0
ENABLE_BREAKPAD
?=
0
CXXFLAGS
+=
-gdwarf
-g
-Wall
-Wno-unused-variable
-Wno-unused-function
-std
=
c++11
CXX
=
g++
INCS
=
-I
../include
\
`
pkg-config
--cflags
libevent
`
LIBS
=
`
pkg-config
--libs
libevent
`
\
-lpthread
\
-levent_pthreads
ifeq
($(DEBUG),1)
CXXFLAGS
+=
-DDEBUG
-O0
else
CXXFLAGS
+=
-DNDEBUG
-O3
endif
ifeq
($(ENABLE_BREAKPAD),1)
INCS
+=
`
pkg-config
--cflags
breakpad
`
LIBS
+=
`
pkg-config
--libs
breakpad
`
endif
OUT_DIR
=
./build
OBJ_DIR
=
$(OUT_DIR)
/objs
all
:
make_dir bench bench_client demo server_demo server_demo_libevent
.PHONY
:
make_dir
make_dir
:
-
mkdir
-p
$(OBJ_DIR)
$(OBJ_DIR)/bench.o
:
bench/bench.cpp
$(CXX)
$(CXXFLAGS)
-c
$<
-o
$(OBJ_DIR)
/bench.o
$(INCS)
$(OBJ_DIR)/bench_client.o
:
bench_client/bench_client.cpp
$(CXX)
$(CXXFLAGS)
-c
$<
-o
$(OBJ_DIR)
/bench_client.o
$(INCS)
$(OBJ_DIR)/demo.o
:
demo/demo.cpp
$(CXX)
$(CXXFLAGS)
-c
$<
-o
$(OBJ_DIR)
/demo.o
$(INCS)
$(OBJ_DIR)/server_demo.o
:
server_demo/server_demo.cpp
$(CXX)
$(CXXFLAGS)
-c
$<
-o
$(OBJ_DIR)
/server_demo.o
$(INCS)
$(OBJ_DIR)/server_demo_libevent.o
:
server_demo_libevent/server_demo_libevent.cpp
$(CXX)
$(CXXFLAGS)
-c
$<
-o
$(OBJ_DIR)
/server_demo_libevent.o
$(INCS)
bench
:
$(OBJ_DIR)/bench.o
$(CXX)
$^
$(LDFLAGS)
-o
$(OUT_DIR)
/bench
$(LIBS)
bench_client
:
$(OBJ_DIR)/bench_client.o
$(CXX)
$^
$(LDFLAGS)
-o
$(OUT_DIR)
/bench_client
$(LIBS)
demo
:
$(OBJ_DIR)/demo.o
$(CXX)
$^
$(LDFLAGS)
-o
$(OUT_DIR)
/demo
$(LIBS)
server_demo
:
$(OBJ_DIR)/server_demo.o
$(CXX)
$^
$(LDFLAGS)
-o
$(OUT_DIR)
/server_demo
$(LIBS)
server_demo_libevent
:
$(OBJ_DIR)/server_demo_libevent.o
$(CXX)
$^
$(LDFLAGS)
-o
$(OUT_DIR)
/server_demo_libevent
$(LIBS)
.PHONY
:
clean
clean
:
-
rm
-rf
$(OUT_DIR)
include/ademco_packet.h
View file @
14606367
...
@@ -1078,7 +1078,9 @@ struct AdemcoPacket
...
@@ -1078,7 +1078,9 @@ struct AdemcoPacket
// parser
// parser
ParseResult
parse
(
const
char
*
pack
,
size_t
pack_len
,
size_t
&
cb_commited
)
{
ParseResult
parse
(
const
char
*
pack
,
size_t
pack_len
,
size_t
&
cb_commited
)
{
//AUTO_LOG_FUNCTION;
//AUTO_LOG_FUNCTION;
#ifdef _DEBUG
try
{
try
{
#endif
do
{
do
{
if
(
pack_len
<
9
)
{
if
(
pack_len
<
9
)
{
JLOG_INFO
(
"AdemcoPacket::Parse pack_len {} < 9"
,
pack_len
);
JLOG_HEX
(
pack
,
pack_len
);
JLOG_INFO
(
"AdemcoPacket::Parse pack_len {} < 9"
,
pack_len
);
JLOG_HEX
(
pack
,
pack_len
);
...
@@ -1229,10 +1231,13 @@ struct AdemcoPacket
...
@@ -1229,10 +1231,13 @@ struct AdemcoPacket
cb_commited
=
p
-
pack
;
cb_commited
=
p
-
pack
;
return
ParseResult
::
RESULT_OK
;
return
ParseResult
::
RESULT_OK
;
}
while
(
0
);
}
while
(
0
);
#ifdef _DEBUG
}
catch
(
std
::
exception
&
e
)
{
}
catch
(
std
::
exception
&
e
)
{
printf
(
"AdemcoPacket::parse EXCEPTION: %s
\n
"
,
e
.
what
());
printf
(
"AdemcoPacket::parse EXCEPTION: %s
\n
"
,
e
.
what
());
abort
();
abort
();
}
}
#endif
// dump data
// dump data
JLOG_HEX
(
pack
,
std
::
min
(
pack_len
,
jlib
::
MAX_INPUT_BUFF_LEN
));
JLOG_HEX
(
pack
,
std
::
min
(
pack_len
,
jlib
::
MAX_INPUT_BUFF_LEN
));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment