rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-18 08:54:15 +01:00
Code Issues Releases Activity

Merge branch 'kfinisterre/WiresharkPlugin' into next

Browse Source
This commit is contained in:
abeck70 2015-05-19 08:49:55 +10:00
commit 6adfa0a292
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ground/openpilotgcs/src/plugins/uavobjects/wireshark/op-uavobjects/Makefile.am
View File

@ -81,7 +81,7 @@ LIBS =
# a plugin.c file for a plugin.
# All subsequent arguments are the files to scan.
#
plugin.c: $(DISSECTOR_SRC) Makefile.common $(top_srcdir)/tools/make-dissector-reg \
plugin.c: $(DISSECTOR_SRC) Makefile.common \
$(top_srcdir)/tools/make-dissector-reg.py
@if test -n "$(PYTHON)"; then \
echo Making plugin.c with python ; \

4
ground/openpilotgcs/src/plugins/uavobjects/wireshark/op-uavobjects/packet-op-uavobjects.c.template
View File

@ -49,7 +49,7 @@ $(ENUMFIELDNAMES)
void proto_reg_handoff_op_uavobjects_$(NAMELC)(void);
static int dissect_uavo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
static int dissect_uavo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
{
int offset = 0;
@ -108,5 +108,5 @@ void proto_reg_handoff_op_uavobjects_$(NAMELC)(void)
uavo_handle = new_create_dissector_handle(dissect_uavo, proto_uavo);
/* Bind this protocol to its UAV ObjID in UAVTalk */
dissector_add("uavtalk.objid", $(OBJIDHEX), uavo_handle);
dissector_add_uint("uavtalk.objid", $(OBJIDHEX), uavo_handle);
}

2
ground/openpilotgcs/src/plugins/uavobjects/wireshark/op-uavtalk/Makefile.am
View File

@ -81,7 +81,7 @@ LIBS =
# a plugin.c file for a plugin.
# All subsequent arguments are the files to scan.
#
plugin.c: $(DISSECTOR_SRC) Makefile.common $(top_srcdir)/tools/make-dissector-reg \
plugin.c: $(DISSECTOR_SRC) Makefile.common \
$(top_srcdir)/tools/make-dissector-reg.py
@if test -n "$(PYTHON)"; then \
echo Making plugin.c with python ; \

2
ground/openpilotgcs/src/plugins/uavobjects/wireshark/op-uavtalk/packet-op-uavtalk.c
View File

@ -66,7 +66,7 @@ void proto_reg_handoff_op_uavtalk(void);
#define UAVTALK_HEADER_SIZE 8
#define UAVTALK_TRAILER_SIZE 1
static int dissect_op_uavtalk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
static int dissect_op_uavtalk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
{
gint offset = 0;

4
ground/uavobjgenerator/generators/wireshark/uavobjectgeneratorwireshark.cpp
View File

@ -233,7 +233,7 @@ bool UAVObjectGeneratorWireshark::process_object(ObjectInfo *info, QDir outputpa
} else if (info->fields[n]->type == FIELDTYPE_FLOAT32) {
headerfields.append(QString("\t BASE_NONE, NULL, 0x0, NULL, HFILL \r\n"));
} else {
headerfields.append(QString("\t BASE_DEC_HEX, NULL, 0x0, NULL, HFILL\r\n"));
headerfields.append(QString("\t BASE_DEC, NULL, 0x0, NULL, HFILL\r\n"));
}
headerfields.append(QString("\t },\r\n"));
headerfields.append(QString("\t },\r\n"));
@ -268,7 +268,7 @@ bool UAVObjectGeneratorWireshark::process_object(ObjectInfo *info, QDir outputpa
} else if (info->fields[n]->type == FIELDTYPE_FLOAT32) {
headerfields.append(QString("\t BASE_NONE, NULL, 0x0, NULL, HFILL \r\n"));
} else {
headerfields.append(QString("\t BASE_DEC_HEX, NULL, 0x0, NULL, HFILL\r\n"));
headerfields.append(QString("\t BASE_DEC, NULL, 0x0, NULL, HFILL\r\n"));
}
headerfields.append(QString("\t },\r\n"));
headerfields.append(QString("\t },\r\n"));