Import OCTSDR-2G-WS-02.02.04-B403-ALPHA

application/tool/wireshark/plugins/octasic/MakeRules.nmake

@@ -22,7 +22,11 @@ CFLAGS=/DHAVE_CONFIG_H /I$(WIRESHARK_LIBS)/../ $(GLIB_CFLAGS) \
 !IF EXIST("$(OCT_INC)/octcodec")	
 	/I$(OCT_INC)/octcodec \
 !ENDIF		
+!IF EXIST("$(OCT_INC)/octvc1")
+	/I$(OCT_INC)/octvc1 \
+!ELSEIF	EXIST("$(OCT_INC)/vocallo")
 	/I$(OCT_INC)/vocallo \
+!ENDIF
 !IF EXIST("$(OCT_INC)/../octmfa_api/include")	
 	/I$(OCT_INC)/../octmfa_api/include \
 !ENDIF	

application/tool/wireshark/plugins/octasic/include/oct_ws_macro.h

@@ -2,13 +2,13 @@
 
 File: oct_ws_macro.c
 
-Copyright (c) 2014 Octasic Inc. All rights reserved.
+Copyright (c) 2015 Octasic Inc. All rights reserved.
 
 Description:	Wireshark macro
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as published by
+it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
+the Free Software Foundation; either version 2 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
@@ -16,10 +16,11 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
-You should have received a copy of the GNU Affero General Public License
+You should have received a copy of the GNU General Public License along
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-Release: Octasic Application Development Framework OCTADF-01.00.01-B497 (2014/01/09)
+Release: Octasic Application Development Framework OCTADF-03.03.00-B1571 (2015/03/24)
 
 $Octasic_Revision: 4 $
 

application/tool/wireshark/plugins/octasic/include/oct_ws_priv.h

@@ -2,13 +2,13 @@
 
 File: oct_ws_priv.c
 
-Copyright (c) 2014 Octasic Inc. All rights reserved.
+Copyright (c) 2015 Octasic Inc. All rights reserved.
 
 Description:	Wireshark private data
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as published by
+it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
+the Free Software Foundation; either version 2 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
@@ -16,10 +16,11 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
-You should have received a copy of the GNU Affero General Public License
+You should have received a copy of the GNU General Public License along
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-Release: Octasic Application Development Framework OCTADF-01.00.01-B497 (2014/01/09)
+Release: Octasic Application Development Framework OCTADF-03.03.00-B1571 (2015/03/24)
 
 $Octasic_Revision: 4 $
 

application/tool/wireshark/plugins/octasic/include/oct_ws_version.h

@@ -2,13 +2,13 @@
 
 File: oct_ws_version.c
 
-Copyright (c) 2014 Octasic Inc. All rights reserved.
+Copyright (c) 2015 Octasic Inc. All rights reserved.
 
 Description:	Octasic plugin version
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as published by
+it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
+the Free Software Foundation; either version 2 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
@@ -16,10 +16,11 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
-You should have received a copy of the GNU Affero General Public License
+You should have received a copy of the GNU General Public License along
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-Release: Octasic Application Development Framework OCTADF-01.00.01-B497 (2014/01/09)
+Release: Octasic Application Development Framework OCTADF-03.03.00-B1571 (2015/03/24)
 
 $Octasic_Revision: 4 $
 

application/tool/wireshark/plugins/octasic/octpkt_ws/Makefile.am

@@ -1,7 +1,8 @@
 # Makefile.am
 
 OCT_INC = $(OCT_PATH)/software/include
-INCLUDES = -I$(top_srcdir) -I$(includedir) -I$(OCT_INC) -I$(OCT_INC)/vocallo -I$(OCT_INC)/octpkt
+
+INCLUDES = -I$(top_srcdir) -I$(includedir) -I$(OCT_INC) -I$(OCT_INC)/octvc1 -I$(OCT_INC)/vocallo -I$(OCT_INC)/octpkt
 
 include Makefile.common
 

application/tool/wireshark/plugins/octasic/octpkt_ws/include/moduleinfo.h

@@ -1,30 +1,4 @@
-/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\
+/* Included *after* config.h, in order to re-define these macros */
-
-File: moduleinfo.h
-
-$Octasic_Copyright: $
-
-Description: Included *after* config.h, in order to re-define these macros
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-$Octasic_Release: $
-
-$Revision: $
-
-\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
-
 #include "../../include/oct_ws_version.h"
 
 #ifdef PACKAGE

application/tool/wireshark/plugins/octasic/octpkt_ws/source/octpkt.c

@@ -1,29 +1,27 @@
-/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\
+/* octpkt.c
-
+ * Routines for octpkt dissection
-File: octpkt.c
+ * Copyright 2004, Ocatasic inc.
-
+ *
-$Octasic_Copyright: $
+ * $Id: README.developer 11475 2004-07-23 01:37:35Z guy $
-
+ *
-Description: 
+ * Ethereal - Network traffic analyzer
-
+ * By Gerald Combs <gerald@ethereal.com>
-This program is free software; you can redistribute it and/or modify
+ * Copyright 1998 Gerald Combs
-it under the terms of the GNU Affero General Public License as published by
+ * *
-the Free Software Foundation; either version 3 of the License, or
+ * This program is free software; you can redistribute it and/or
-(at your option) any later version.
+ * modify it under the terms of the GNU General Public License
-
+ * as published by the Free Software Foundation; either version 2
-This program is distributed in the hope that it will be useful,
+ * of the License, or (at your option) any later version.
-but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * This program is distributed in the hope that it will be useful,
-GNU General Public License for more details.
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-You should have received a copy of the GNU Affero General Public License
+ * GNU General Public License for more details.
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
-
+ * You should have received a copy of the GNU General Public License
-$Octasic_Release: $
+ * along with this program; if not, write to the Free Software
-
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-$Revision: $
+ */
-
-\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
  #ifdef HAVE_CONFIG_H
 # include "config.h"

application/tool/wireshark/plugins/octasic/octpkt_ws/source/plugin.c

@@ -1,29 +1,5 @@
-/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\
+/* Do not modify this file.  */
-
+/* It is created automatically by the Makefile.  */
-File: plugin.c
-
-$Octasic_Copyright: $
-
-Description:
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-$Octasic_Release: $
-
-$Revision: $
-
-\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"

application/tool/wireshark/plugins/octasic/octsdr/makefile.nmake

@@ -2,23 +2,57 @@
 # nmake file for Wireshark plugins
 DEV_ROOT=../../../../../../..
 WS_ROOT=../../../..
-    
+
+      
+!IFNDEF TGT_WS_VERSION
+#Try to find Wireshark version
+WS_APP_PLUGIN=$(PROGRAMFILES)/wireshark/plugins/
+!IF EXIST("$(WS_APP_PLUGIN)/1.2.6")
+TGT_WS_VERSION=1.2.6
+!ENDIF
+!IF EXIST("$(WS_APP_PLUGIN)/1.6.5")
+TGT_WS_VERSION=1.6.5
+!ENDIF
+!ENDIF
+
       
 all: setup_m
 	@cd "octvc1"
 	@$(MAKE) /NOLOGO /$(MAKEFLAGS) -f makefile.nmake 
 	@cd $(MAKEDIR)
 
+	@cd "octvocnet_ws"
+	@$(MAKE) /NOLOGO /$(MAKEFLAGS) -f makefile.nmake 
+	@cd $(MAKEDIR)
+
+
 clean: setup_m
 	@cd "octvc1"
 	@$(MAKE) /NOLOGO /$(MAKEFLAGS) -f makefile.nmake clean
 	@cd $(MAKEDIR)
 
+	@cd "octvocnet_ws"
+	@$(MAKE) /NOLOGO /$(MAKEFLAGS) -f makefile.nmake clean
+	@cd $(MAKEDIR)
+
+
 install: setup_m
 	@cd "octvc1"
 	@$(MAKE) /NOLOGO /$(MAKEFLAGS) -f makefile.nmake install
 	@cd $(MAKEDIR)
 
+	@cd "octvocnet_ws"
+	@$(MAKE) /NOLOGO /$(MAKEFLAGS) -f makefile.nmake install
+	@cd $(MAKEDIR)
+
+	@if exist ..\..\..\$(TGT_WS_VERSION)\plugins @xcopy "..\..\..\$(TGT_WS_VERSION)\plugins\*.dll" "$(WS_APP_PLUGIN:/=\)$(TGT_WS_VERSION)" /Y /I /Q
+
+smoke_app: setup_m
+	@cd "octvc1"
+	@$(MAKE) /NOLOGO /$(MAKEFLAGS) -f MakeSmokeApp.nmake
+	@cd $(MAKEDIR)
+
+
 setup_m: 
 	@SET WS_ROOT=$(WS_ROOT)
 	@SET DEV_ROOT=$(DEV_ROOT)

application/tool/wireshark/plugins/octasic/octsdr/octvc1/MakeSmokeApp.nmake

@@ -63,7 +63,11 @@ CFLAGS=/DHAVE_CONFIG_H /I$(WIRESHARK_LIBS)/../ $(GLIB_CFLAGS) \
 	$(cflags)	\
 	$(LOCAL_CFLAGS)	\
 	/I ../../	\
+!IF EXIST("$(OCT_INC)/octvc1")
+	/I$(OCT_INC)/octvc1 \
+!ELSEIF	EXIST("$(OCT_INC)/vocallo")
 	/I$(OCT_INC)/vocallo \
+!ENDIF
 	/I$(PCAP_DIR)\include -D_U_=""
 
 CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL

application/tool/wireshark/plugins/octasic/octsdr/octvc1/Makefile.am

@@ -1,6 +1,7 @@
 # Makefile.am
 OCT_INC = $(OCT_PATH)/software/include
-INCLUDES = -I$(top_srcdir) -I$(includedir) -I$(OCT_INC) -I$(OCT_INC)/vocallo -I$(OCT_INC)/octpkt
+
+INCLUDES = -I$(top_srcdir) -I$(includedir) -I$(OCT_INC) -I$(OCT_INC)/octvc1 -I$(OCT_INC)/vocallo -I$(OCT_INC)/octpkt
 
 include Makefile.common
 

application/tool/wireshark/plugins/octasic/octsdr/octvc1/Makefile.common

@@ -7,9 +7,10 @@ DISSECTOR_SRC= \
 	source/octvc1_common.c \
 	source/octvc1_module_ctrl.c \
 	source/octvc1_module_main.c \
+	source/octvc1_module_test.c \
+	source/octvc1_module_hw.c \
+	source/octvc1_module_irsc.c \
 	source/octvc1_module_gsm.c \
-	source/octvc1_module_cpp.c \
-	source/octvc1_module_net.c \
 	source/octvc1_cid_eid_value_string.c
 
 PLUGIN_NAME=octvc1_ws

application/tool/wireshark/plugins/octasic/octsdr/octvc1/include/module.h

@@ -2,13 +2,13 @@
 
 File: module.h
 
-Copyright (c) 2014 Octasic Inc. All rights reserved.
+Copyright (c) 2015 Octasic Inc. All rights reserved.
 
 Description:	Wireshark module
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as published by
+it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
+the Free Software Foundation; either version 2 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
@@ -16,10 +16,11 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
-You should have received a copy of the GNU Affero General Public License
+You should have received a copy of the GNU General Public License along
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-Release: Octasic Application Development Framework OCTADF-01.00.01-B497 (2014/01/09)
+Release: Octasic Application Development Framework OCTADF-03.03.00-B1571 (2015/03/24)
 
 $Octasic_Revision: 4 $
 

application/tool/wireshark/plugins/octasic/octsdr/octvc1/include/octdev_common.h

@@ -2,24 +2,26 @@
 
 File: octdev_common.h
 
-Copyright (c) 2014 Octasic Inc. All rights reserved.
+      
+Copyright (c) 2015 Octasic Inc. All rights reserved.
 
 Description: Contain the wireshark module dissector related functions
 
-This program is free software; you can redistribute it and/or modify
+This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as published by
+it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
+the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-This program is distributed in the hope that it will be useful,
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27)
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-$Octasic_Release: $
 
 $Octasic_Revision: $
 
@@ -34,10 +36,10 @@ $Octasic_Revision: $
 /****************************************************************************
 	COMMON API ENUMERATION STRING VALUES
  ****************************************************************************/
-extern const value_string  vals_tOCT_BOOL32[];
+extern const value_string  vals_tOCT_BOOL32[3];
-extern const value_string  vals_tOCTDEV_IP_VERSION_ENUM[];
+extern const value_string  vals_tOCTDEV_IP_VERSION_ENUM[]; 
-extern const value_string  vals_tOCTDEV_DEVICES_TYPE_ENUM[];
+extern const value_string  vals_tOCTDEV_DEVICES_TYPE_ENUM[]; 
-extern const value_string  vals_tOCTDEV_DEVICES_DSP_CORE_TYPE_ENUM[];
+extern const value_string  vals_tOCTDEV_DEVICES_DSP_CORE_TYPE_ENUM[]; 
 
 #endif /* _OCTDEV_COMMON_H__ */
 

application/tool/wireshark/plugins/octasic/octsdr/octvc1/include/octpkt_common.h

@@ -2,24 +2,26 @@
 
 File: octpkt_common.h
 
-Copyright (c) 2014 Octasic Inc. All rights reserved.
+      
+Copyright (c) 2015 Octasic Inc. All rights reserved.
 
 Description: Contain the wireshark module dissector related functions
 
-This program is free software; you can redistribute it and/or modify
+This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as published by
+it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
+the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-This program is distributed in the hope that it will be useful,
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27)
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-$Octasic_Release: $
 
 $Octasic_Revision: $
 
@@ -34,9 +36,9 @@ $Octasic_Revision: $
 /****************************************************************************
 	COMMON API ENUMERATION STRING VALUES
  ****************************************************************************/
-extern const value_string  vals_tOCTPKT_HDR_FORMAT_PROTO_TYPE_LEN_MASK[];
+extern const value_string  vals_tOCTPKT_HDR_FORMAT_PROTO_TYPE_LEN_MASK[13];
-extern const value_string  vals_tOCTPKT_HDR_CONTROL_PROTOCOL_TYPE_ENUM[];
+extern const value_string  vals_tOCTPKT_HDR_CONTROL_PROTOCOL_TYPE_ENUM[]; 
-extern const value_string  vals_tOCTPKT_HDRXL_FORMAT_PROTO_TYPE_LEN_MASK[];
+extern const value_string  vals_tOCTPKT_HDRXL_FORMAT_PROTO_TYPE_LEN_MASK[10];
 
 #endif /* _OCTPKT_COMMON_H__ */
 

application/tool/wireshark/plugins/octasic/octsdr/octvc1/include/octvc1_common.h

@@ -2,24 +2,26 @@
 
 File: octvc1_common.h
 
-Copyright (c) 2014 Octasic Inc. All rights reserved.
+      
+Copyright (c) 2015 Octasic Inc. All rights reserved.
 
 Description: Contain the wireshark module dissector related functions
 
-This program is free software; you can redistribute it and/or modify
+This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as published by
+it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
+the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-This program is distributed in the hope that it will be useful,
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27)
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Release: Octasic Application Development Framework OCTADF-01.00.01-B497 (2014/01/09)
 
 $Octasic_Revision: $
 
@@ -37,18 +39,31 @@ $Octasic_Revision: $
 /****************************************************************************
 	COMMON API ENUMERATION STRING VALUES
  ****************************************************************************/
-extern const value_string  vals_tOCTVC1_OBJECT_CURSOR_ENUM[];
+extern const value_string  vals_tOCTVC1_OBJECT_CURSOR_ENUM[]; 
-extern const value_string  vals_tOCTVC1_BUFFER_FORMAT_ENUM[];
+extern const value_string  vals_tOCTVC1_BUFFER_FORMAT_ENUM[]; 
-extern const value_string  vals_tOCTVC1_BUFFER_FORMAT_MAIN_ENUM[];
+extern const value_string  vals_tOCTVC1_BUFFER_FORMAT_MAIN_ENUM[]; 
-extern const value_string  vals_tOCTVC1_ETH_PORT_ID_ENUM[];
+extern const value_string  vals_tOCTVC1_ETH_PORT_ID_ENUM[]; 
-extern const value_string  vals_tOCTVC1_IP_VERSION_ENUM[];
+extern const value_string  vals_tOCTVC1_IP_VERSION_ENUM[]; 
-extern const value_string  vals_tOCTVC1_VLAN_PROTOCOL_ID_ENUM[];
+extern const value_string  vals_tOCTVC1_VLAN_PROTOCOL_ID_ENUM[]; 
-extern const value_string  vals_tOCTVC1_MSG_FLAGS_MASK[];
+extern const value_string  vals_tOCTVC1_MSG_FLAGS_MASK[4];
-extern const value_string  vals_tOCTVC1_LOG_TYPE_ENUM[];
+extern const value_string  vals_tOCTVC1_LOG_TYPE_ENUM[]; 
-extern const value_string  vals_tOCTVC1_LOG_LEVEL_ENUM[];
+extern const value_string  vals_tOCTVC1_LOG_LEVEL_ENUM[]; 
-extern const value_string  vals_tOCTVC1_LOG_TRACE_MASK[];
+extern const value_string  vals_tOCTVC1_LOG_PAYLOAD_TYPE_ENUM[]; 
-extern const value_string  vals_tOCTVC1_FILE_TYPE_ENUM[];
+extern const value_string  vals_tOCTVC1_LOG_TRACE_MASK[11];
-extern const value_string  vals_tOCTVC1_FILE_FORMAT_ENUM[];
+extern const value_string  vals_tOCTVC1_FILE_TYPE_ENUM[]; 
+extern const value_string  vals_tOCTVC1_FILE_FORMAT_ENUM[]; 
+extern const value_string  vals_tOCTVC1_MODULE_ID_ENUM[]; 
+extern const value_string  vals_tOCTVC1_RADIO_STANDARD_ENUM[]; 
+extern const value_string  vals_tOCTVC1_RADIO_STANDARD_FREQ_BAND_GSM_ENUM[]; 
+extern const value_string  vals_tOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM[]; 
+extern const value_string  vals_tOCTVC1_RADIO_STANDARD_FREQ_BAND_LTE_ENUM[]; 
+extern const value_string  vals_tOCTVC1_RADIO_CONFIG_SCRIPT_TYPE_ENUM[]; 
+extern const value_string  vals_tOCTVC1_RADIO_ID_DIRECTION_ENUM[]; 
+extern const value_string  vals_tOCTVC1_RADIO_STANDARD_BANDWIDTH_ENUM[]; 
+extern const value_string  vals_tOCTVC1_RADIO_RX_GAIN_CTRL_MODE_ENUM[]; 
+extern const value_string  vals_tOCTVC1_PROCESS_TYPE_ENUM[]; 
+extern const value_string  vals_tOCTVC1_PROCESS_STATE_ENUM[]; 
+extern const value_string  vals_tOCTVC1_PROCESS_TASK_STATE_ENUM[]; 
 
 /****************************************************************************
 	COMMON API DISSECTOR
@@ -61,18 +76,28 @@ extern unsigned int  dissect_tOCTVC1_CURSOR_HANDLE_OBJECT_GET(tvbuff_t *tvb, pac
 extern unsigned int  dissect_tOCTVC1_CURSOR_HANDLE_OBJECT_GET_HANDLE_OBJECT(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue );
 extern unsigned int  dissect_tOCTVC1_CURSOR_HANDLE_OBJECT_GET_SUB_OBJECT_ID(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue );
 extern unsigned int  dissect_tOCTVC1_CURSOR_INDEX_GET(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue );
+extern unsigned int  dissect_tOCTVC1_CURSOR_INDEX_GET_SUB_INDEX(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue );
+extern unsigned int  dissect_tOCTVC1_HANDLE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue );
+extern unsigned int  dissect_tOCTVC1_OBJECT32_NAME(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue );
 extern unsigned int  dissect_tOCTVC1_VLAN_TAG(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue );
 extern unsigned int  dissect_tOCTVC1_VLAN_HEADER_INFO(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue );
 extern unsigned int  dissect_tOCTVC1_LIST_HANDLE_GET(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue );
 extern unsigned int  dissect_tOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue );
 extern unsigned int  dissect_tOCTVC1_LIST_HANDLE_OBJECT_GET(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue );
+extern unsigned int  dissect_tOCTVC1_LIST_NAME_OBJECT32_GET(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue );
+extern unsigned int  dissect_tOCTVC1_LIST_HANDLE_OBJECT_GET_SUB_OBJECT_ID_NAME(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue );
 extern unsigned int  dissect_tOCTVC1_LIST_HANDLE_OBJECT_GET_SUB_OBJECT_ID(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue );
 extern unsigned int  dissect_tOCTVC1_LIST_INDEX_GET(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue );
+extern unsigned int  dissect_tOCTVC1_LIST_INDEX_GET_SUB_INDEX(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue );
 extern unsigned int  dissect_tOCTVC1_MSG_HEADER(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue );
 extern unsigned int  dissect_tOCTVC1_EVENT_HEADER(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue );
 extern unsigned int  dissect_tOCTVC1_LOG_HEADER(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue );
 extern unsigned int  dissect_tOCTVC1_FILE_HEADER(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue );
-extern unsigned int  dissect_tOCTVC1_HANDLE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue );
+extern unsigned int  dissect_tOCTVC1_API_SESSION_INFO(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue );
+extern unsigned int  dissect_tOCTVC1_API_SESSION_EVT_INFO(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue );
+extern unsigned int  dissect_tOCTVC1_PROCESS_ERROR(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue );
+extern unsigned int  dissect_tOCTVC1_PROCESS_TASK_STATS(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue );
+extern unsigned int  dissect_tOCTVC1_PROCESS_CPU_USAGE_STATS(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue );
 
 /****************************************************************************
 	COMMON USER REGISTATION
@@ -80,16 +105,12 @@ extern unsigned int  dissect_tOCTVC1_HANDLE(tvbuff_t *tvb, packet_info *pinfo, p
 void ws_register_OCTVC1_common(void);
 #define cOCTVC1_PRIVATE_ID_STRING "unknowned_private"
 #define cOCTVC1_UNKNOWN_STRING "Unknown"
-#define cOCTVC1_GOD_USER  "oct-super-user"
+#define cOCTVC1_GOD_USER  "user_0"
-#define cOCTVC1_GOD_USER_ID  "octsu98asic"
+#define cOCTVC1_GOD_USER_ID  "user_1"
-#define cOCTVC1_PRIVATE_VISIBILITY_USER  "oct-dev"
+#define cOCTVC1_PRIVATE_VISIBILITY_USER  "user_2"
 #ifdef OCT_DECLARE_COMMON
-gchar* aOCTVC1_user_list[][2] = {
+gchar* aOCTVC1_user_list[][2] = {
-	{ "oct-dev","octdev98asic"},
+{NULL,NULL}
-	{ "feature-spec","feature-psw"},
-	{ "company","company-psw"},
-	{ "company-2","company-2-psw"},
-	{NULL,NULL}
  };
 #else
 gchar* aOCTVC1_user_list[][2];

application/tool/wireshark/plugins/octasic/octsdr/octvc1/include/octvocnet_common.h

@@ -2,24 +2,26 @@
 
 File: octvocnet_common.h
 
-Copyright (c) 2014 Octasic Inc. All rights reserved.
+      
+Copyright (c) 2015 Octasic Inc. All rights reserved.
 
 Description: Contain the wireshark module dissector related functions
 
-This program is free software; you can redistribute it and/or modify
+This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as published by
+it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
+the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-This program is distributed in the hope that it will be useful,
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27)
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Release: Octasic Application Development Framework OCTADF-01.00.01-B497 (2014/01/09)
 
 $Octasic_Revision: $
 
@@ -34,8 +36,7 @@ $Octasic_Revision: $
 /****************************************************************************
 	COMMON API ENUMERATION STRING VALUES
  ****************************************************************************/
-extern const value_string  vals_tOCTVOCNET_PKT_CONTROL_PROTOCOL_TYPE_ENUM[];
+extern const value_string  vals_tOCTVOCNET_PKT_CONTROL_PROTOCOL_TYPE_ENUM[]; 
-extern const value_string  vals_tOCTVOCNET_PKT_D_TYPE_ENUM[];
 
 #endif /* _OCTVOCNET_COMMON_H__ */
 

application/tool/wireshark/plugins/octasic/octsdr/octvc1/include/plugin_info.h

@@ -2,13 +2,13 @@
 
 File: plugin_info.h
 
-Copyright (c) 2014 Octasic Inc. All rights reserved.
+Copyright (c) 2015 Octasic Inc. All rights reserved.
 
 Description:	Wireshark plugin common
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as published by
+it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
+the Free Software Foundation; either version 2 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
@@ -16,10 +16,11 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
-You should have received a copy of the GNU Affero General Public License
+You should have received a copy of the GNU General Public License along
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-Release: Octasic Application Development Framework OCTADF-01.00.01-B497 (2014/01/09)
+Release: Octasic Application Development Framework OCTADF-03.03.00-B1571 (2015/03/24)
 
 $Octasic_Revision: 4 $
 

application/tool/wireshark/plugins/octasic/octsdr/octvc1/include/ws_util.h

@@ -3,13 +3,13 @@
 
 File: oct_ws_util.h
 
-Copyright (c) 2014 Octasic Inc. All rights reserved.
+Copyright (c) 2015 Octasic Inc. All rights reserved.
 
 Description:	Wireshark utility
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as published by
+it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
+the Free Software Foundation; either version 2 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
@@ -17,10 +17,11 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
-You should have received a copy of the GNU Affero General Public License
+You should have received a copy of the GNU General Public License along
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-Release: Octasic Application Development Framework OCTADF-01.00.01-B497 (2014/01/09)
+Release: Octasic Application Development Framework OCTADF-03.03.00-B1571 (2015/03/24)
 
 $Octasic_Revision: 4 $
 

application/tool/wireshark/plugins/octasic/octsdr/octvc1/makefile.nmake

@@ -7,7 +7,6 @@ SRC_PATH=source
 #
 DEV_ROOT=../../../../../../..
 WS_ROOT=../../../..
-TGT_WS_VERSION=1.6.5
 #
 DISSECTOR_SRC= \
 	$(SRC_PATH)/octvc1_plugin.c $(SRC_PATH)/octvc1_msg_ctrl.c $(SRC_PATH)/octvc1_msg_event.c \
@@ -19,9 +18,10 @@ DISSECTOR_SRC= \
 	$(SRC_PATH)/octvc1_cid_eid_value_string.c \
 	$(SRC_PATH)/octvc1_module_ctrl.c \
 	$(SRC_PATH)/octvc1_module_main.c \
+	$(SRC_PATH)/octvc1_module_test.c \
+	$(SRC_PATH)/octvc1_module_hw.c \
+	$(SRC_PATH)/octvc1_module_irsc.c \
 	$(SRC_PATH)/octvc1_module_gsm.c \
-	
-	
 
 !include ..\..\..\..\$(TGT_WS_VERSION)\config.nmake
 

application/tool/wireshark/plugins/octasic/octsdr/octvc1/oasis2ws.nmake

@@ -1,141 +0,0 @@
-# oasis2ws.nmake
-# nmake file for Wireshark plugin
-#
-!include $(OASIS_MAKE)/$(OASIS_PROJECT)/$(OASIS_PROJECT_PACKAGE)/oasis_project.common
-!include $(OASIS2WS_PATH)/makefile/common.nmake
-
-WS_TARGET_SRC_FILE_LIST = \
-	$(WS_PACKAGE_TARGET)/source/octvc1_common.c \
-	$(WS_PACKAGE_TARGET)/source/octvc1_cid_eid_value_string.c \
-	$(WS_PACKAGE_TARGET)/source/octdev_common.c \
-	$(WS_PACKAGE_TARGET)/source/octpkt_common.c \
-	$(WS_PACKAGE_TARGET)/source/octvocnet_common.c \
-	$(WS_PACKAGE_TARGET)/source/octvc1_module_ctrl.c \
-	$(WS_PACKAGE_TARGET)/source/octvc1_module_main.c \
-	$(WS_PACKAGE_TARGET)/source/octvc1_module_gsm.c \
-	$(WS_PACKAGE_TARGET)/source/octvc1_module_cpp.c \
-	$(WS_PACKAGE_TARGET)/source/octvc1_module_net.c \
-
-WS_TARGET_HEADER_FILE_LIST = \
-	$(WS_PACKAGE_TARGET)/include/octvc1_common.h \
-	$(WS_PACKAGE_TARGET)/include/octdev_common.h \
-	$(WS_PACKAGE_TARGET)/include/octpkt_common.h \
-	$(WS_PACKAGE_TARGET)/include/octvocnet_common.h \
-
-WS_TARGET_SMOKE_TEST_LIST = \
-	$(WS_PACKAGE_TARGET)/smoke_test/ws_smoke.c
-
-WS_TARGET_DEFAULT_FILE_LIST = \
-	$(WS_PROJECT_TARGET)/include/module.h
-
-WS_TARGET_COMPANION_FILE_LIST = \
-	$(WS_PACKAGE_TARGET)/../octvocnet_ws/include/octvocnet_common.h \
-	$(WS_PACKAGE_TARGET)/../octvocnet_ws/source/octvocnet_common.c \
-
-OASIS_DEPENDENCIES = \
-	$(OASIS_SOURCE_ALL) \
-	$(OASIS_SOURCE_COMMON) \
-	$(OASIS_MAKE)/$(OASIS_PROJECT)/catalog.xml
-
-all: about oasis2ws
-
-# ----------------------------------------------------------------------------------
-# OCTVC1 plugin transformations
-# ----------------------------------------------------------------------------------
-$(WS_PACKAGE_TARGET)/include/octvc1_common.h: $(OASIS_DEPENDENCIES) $(OASIS_XSLT_WS_COMMON_DIS) $(OASIS_SOURCE_MODULE)
-	@echo Generating: $@
-	$(OASIS_XSLT_PROC) --stringparam action GEN_PLUGIN --stringparam target $(WS_PACKAGE_TARGET) --output $@ $(OASIS_XSLT_WS_COMMON_DIS) $(OASIS_PACKAGE_BUILD_PATH)/catalog.xml 
-
-$(WS_PACKAGE_TARGET)/source/octvc1_common.c: $(OASIS_DEPENDENCIES) $(OASIS_XSLT_WS_MODULE_DIS) $(OASIS_SOURCE_MODULE)
-	@echo Generating: $@
-	$(OASIS_XSLT_PROC) --stringparam oasis_module NONE --stringparam action GEN_PLUGIN --output $@ $(OASIS_XSLT_WS_MODULE_DIS) $(OASIS_PACKAGE_BUILD_PATH)/catalog.xml
-
-$(WS_PACKAGE_TARGET)/source/octvc1_cid_eid_value_string.c: $(OASIS_DEPENDENCIES) $(OASIS_XSLT_WS_CID_EID_STR) $(OASIS_SOURCE_MODULE)
-	@echo Generating: $@
-	$(OASIS_XSLT_PROC) --output $@ $(OASIS_XSLT_WS_CID_EID_STR) $(OASIS_PACKAGE_BUILD_PATH)/catalog.xml
-
-$(WS_PACKAGE_TARGET)/include/octdev_common.h: $(OASIS_DEPENDENCIES) $(OASIS_XSLT_WS_COMMON_DIS) $(OASIS_MAKE)/$(OASIS_PROJECT)/octdev/component/catalog.xml
-	@echo Generating: $@
-	$(OASIS_XSLT_PROC) --stringparam action GEN_COMMON --output $@ $(OASIS_XSLT_WS_COMMON_DIS) $(OASIS_MAKE)/$(OASIS_PROJECT)/octdev/component/catalog.xml
-
-$(WS_PACKAGE_TARGET)/source/octdev_common.c: $(OASIS_DEPENDENCIES) $(OASIS_XSLT_WS_MODULE_DIS) $(OASIS_MAKE)/$(OASIS_PROJECT)/octdev/component/catalog.xml
-	@echo Generating: $@
-	$(OASIS_XSLT_PROC) --stringparam oasis_module NONE --stringparam action GEN_COMMON --output $@ $(OASIS_XSLT_WS_MODULE_DIS) $(OASIS_MAKE)/$(OASIS_PROJECT)/octdev/component/catalog.xml
-
-$(WS_PACKAGE_TARGET)/include/octpkt_common.h: $(OASIS_DEPENDENCIES) $(OASIS_XSLT_WS_COMMON_DIS) $(OASIS_MAKE)/$(OASIS_PROJECT)/octpkt/component/catalog.xml
-	@echo Generating: $@
-	$(OASIS_XSLT_PROC) --stringparam action GEN_COMMON --output $@ $(OASIS_XSLT_WS_COMMON_DIS) $(OASIS_MAKE)/$(OASIS_PROJECT)/octpkt/component/catalog.xml
-
-$(WS_PACKAGE_TARGET)/source/octpkt_common.c: $(OASIS_DEPENDENCIES) $(OASIS_XSLT_WS_MODULE_DIS) $(OASIS_MAKE)/$(OASIS_PROJECT)/octpkt/component/catalog.xml
-	@echo Generating: $@
-	$(OASIS_XSLT_PROC) --stringparam oasis_module NONE --stringparam action GEN_COMMON --output $@ $(OASIS_XSLT_WS_MODULE_DIS) $(OASIS_MAKE)/$(OASIS_PROJECT)/octpkt/component/catalog.xml
-
-$(WS_PACKAGE_TARGET)/include/octvocnet_common.h: $(OASIS_DEPENDENCIES) $(OASIS_XSLT_WS_COMMON_DIS) $(OASIS_MAKE)/$(OASIS_PROJECT)/octvocnet/component/catalog.xml
-	@echo Generating: $@
-	$(OASIS_XSLT_PROC) --stringparam action GEN_COMMON --output $@ $(OASIS_XSLT_WS_COMMON_DIS) $(OASIS_MAKE)/$(OASIS_PROJECT)/octvocnet/component/catalog.xml
-
-$(WS_PACKAGE_TARGET)/source/octvocnet_common.c: $(OASIS_DEPENDENCIES) $(OASIS_XSLT_WS_MODULE_DIS) $(OASIS_MAKE)/$(OASIS_PROJECT)/octvocnet/component/catalog.xml
-	@echo Generating: $@
-	$(OASIS_XSLT_PROC) --stringparam oasis_module NONE --stringparam action GEN_COMMON --output $@ $(OASIS_XSLT_WS_MODULE_DIS) $(OASIS_MAKE)/$(OASIS_PROJECT)/octvocnet/component/catalog.xml
-
-$(WS_PACKAGE_TARGET)/source/octvc1_module_ctrl.c: $(OASIS_DEPENDENCIES) $(OASIS_XSLT_WS_MODULE_DIS) $(OASIS_PACKAGE_BUILD_PATH)/ctrl/octvc1_ctrl_api.xml
-	@echo Generating: $@
-	$(OASIS_XSLT_PROC) --stringparam oasis_module CTRL --output $@ $(OASIS_XSLT_WS_MODULE_DIS) $(OASIS_PACKAGE_BUILD_PATH)/ctrl/octvc1_ctrl_api.xml
-
-$(WS_PACKAGE_TARGET)/source/octvc1_module_main.c: $(OASIS_DEPENDENCIES) $(OASIS_XSLT_WS_MODULE_DIS) $(OASIS_PACKAGE_BUILD_PATH)/main/octvc1_main_api.xml
-	@echo Generating: $@
-	$(OASIS_XSLT_PROC) --stringparam oasis_module MAIN --output $@ $(OASIS_XSLT_WS_MODULE_DIS) $(OASIS_PACKAGE_BUILD_PATH)/main/octvc1_main_api.xml
-
-$(WS_PACKAGE_TARGET)/source/octvc1_module_gsm.c: $(OASIS_DEPENDENCIES) $(OASIS_XSLT_WS_MODULE_DIS) $(OASIS_PACKAGE_BUILD_PATH)/gsm/octvc1_gsm_api.xml
-	@echo Generating: $@
-	$(OASIS_XSLT_PROC) --stringparam oasis_module GSM --output $@ $(OASIS_XSLT_WS_MODULE_DIS) $(OASIS_PACKAGE_BUILD_PATH)/gsm/octvc1_gsm_api.xml
-
-$(WS_PACKAGE_TARGET)/source/octvc1_module_cpp.c: $(OASIS_DEPENDENCIES) $(OASIS_XSLT_WS_MODULE_DIS) $(OASIS_PACKAGE_BUILD_PATH)/cpp/octvc1_cpp_api.xml
-	@echo Generating: $@
-	$(OASIS_XSLT_PROC) --stringparam oasis_module CPP --output $@ $(OASIS_XSLT_WS_MODULE_DIS) $(OASIS_PACKAGE_BUILD_PATH)/cpp/octvc1_cpp_api.xml
-
-$(WS_PACKAGE_TARGET)/source/octvc1_module_net.c: $(OASIS_DEPENDENCIES) $(OASIS_XSLT_WS_MODULE_DIS) $(OASIS_PACKAGE_BUILD_PATH)/net/octvc1_net_api.xml
-	@echo Generating: $@
-	$(OASIS_XSLT_PROC) --stringparam oasis_module NET --output $@ $(OASIS_XSLT_WS_MODULE_DIS) $(OASIS_PACKAGE_BUILD_PATH)/net/octvc1_net_api.xml
-
-# ----------------------------------------------------------------------------------
-# OCTVC1 plugin smoke test
-# ----------------------------------------------------------------------------------
-$(WS_PACKAGE_TARGET)/smoke_test/ws_smoke.c: $(OASIS_DEPENDENCIES) $(OASIS_XSLT_WS_COMMON_DIS) $(OASIS_SOURCE_MODULE)
-	@echo Generating: $@
-	$(OASIS_XSLT_PROC) --output $@ $(OASIS_XSLT_WS_SMOKE) $(OASIS_PACKAGE_BUILD_PATH)/catalog.xml
-
-# ----------------------------------------------------------------------------------
-# OCTVC1 companion plugin
-# ----------------------------------------------------------------------------------
-$(WS_PACKAGE_TARGET)/../octvocnet_ws/include/octvocnet_common.h: $(OASIS_DEPENDENCIES) $(OASIS_XSLT_WS_COMMON_DIS) $(OASIS_MAKE)/$(OASIS_PROJECT)/octvocnet/component/catalog.xml
-	@echo Generating: $@
-	$(OASIS_XSLT_PROC) --stringparam action GEN_COMMON --output $@ $(OASIS_XSLT_WS_COMMON_DIS) $(OASIS_MAKE)/$(OASIS_PROJECT)/octvocnet/component/catalog.xml
-
-$(WS_PACKAGE_TARGET)/../octvocnet_ws/source/octvocnet_common.c: $(OASIS_DEPENDENCIES) $(OASIS_XSLT_WS_MODULE_DIS) $(OASIS_MAKE)/$(OASIS_PROJECT)/octvocnet/component/catalog.xml
-	@echo Generating: $@
-	$(OASIS_XSLT_PROC) --stringparam oasis_module NONE --stringparam action GEN_COMMON --output $@ $(OASIS_XSLT_WS_MODULE_DIS) $(OASIS_MAKE)/$(OASIS_PROJECT)/octvocnet/component/catalog.xml
-
-
-# ----------------------------------------------------------------------------------
-#Rules 
-# ----------------------------------------------------------------------------------
-
-oasis2ws: ws2tgt $(WS_TARGET_SRC_FILE_LIST) $(WS_TARGET_HEADER_FILE_LIST) $(WS_TARGET_SMOKE_TEST_LIST) $(WS_TARGET_COMPANION_FILE_LIST)
-
-clean:
-	-@ erase /Q $(WS_TARGET_SRC_FILE_LIST:/=\)
-	-@ erase /Q $(WS_TARGET_HEADER_FILE_LIST:/=\)
-	-@ erase /Q $(WS_TARGET_SMOKE_TEST_LIST:/=\)
-	-@ erase /Q $(WS_TARGET_COMPANION_FILE_LIST:/=\)
-
-about:
-	@echo +++++++++++++++++++++++++++++++++++++++++++++
-	@echo Generating WS Sources Plugin for OCTVC1
-	@echo from: $(OASIS_MAKE:\=/)/$(OASIS_PROJECT)
-	@echo +++++++++++++++++++++++++++++++++++++++++++++
-
-ws2tgt:
-	@if exist "$(WS_TARGET_ROOT:/=\)\$(OASIS_PROJECT_PACKAGE:/=\)_ws" xcopy $(WS_TARGET_ROOT:/=\)\$(OASIS_PROJECT_PACKAGE:/=\)_ws $(WS_PACKAGE_TARGET:/=\) /D /S /Q /Y /I 1> nul
-	@if exist "$(WS_TARGET_ROOT:/=\)\octvocnet_ws" xcopy $(WS_TARGET_ROOT:/=\)\octvocnet_ws $(WS_PACKAGE_TARGET:/=\)\..\octvocnet_ws /D /S /Q /Y /I 1>nul
-

application/tool/wireshark/plugins/octasic/octsdr/octvc1/oasis_pkgCommon.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<commons>
-  <common lower_name="octdev" href="octdev/component/catalog.xml"/>
-  <common lower_name="octpkt" href="octpkt/component/catalog.xml"/>
-  <common lower_name="octvocnet" href="octvocnet/component/catalog.xml"/>
-  <companion lower_name="octvocnet" href="octvocnet/component/catalog.xml"/>
-</commons>

application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octdev_common.c

@@ -2,13 +2,26 @@
 
 File: octdev_common.c
 
-Copyright (c) 2014 Octasic Inc. All rights reserved.
+      
+Copyright (c) 2015 Octasic Inc. All rights reserved.
 
 Description: Contain the wireshark module dissector related functions
 
-$Octasic_Confidentiality: $
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-Release: Octasic Application Development Framework OCTADF-01.00.01-B497 (2014/01/09)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27)
 
 $Octasic_Revision: $
 
@@ -48,6 +61,7 @@ const value_string  vals_tOCTDEV_DEVICES_TYPE_ENUM[] =
 	{ cOCTDEV_DEVICES_TYPE_ENUM_INVALID, "cOCTDEV_DEVICES_TYPE_ENUM_INVALID" },
 	{ cOCTDEV_DEVICES_TYPE_ENUM_OCT1010, "cOCTDEV_DEVICES_TYPE_ENUM_OCT1010" },
 	{ cOCTDEV_DEVICES_TYPE_ENUM_OCT2200, "cOCTDEV_DEVICES_TYPE_ENUM_OCT2200" },
+	{ cOCTDEV_DEVICES_TYPE_ENUM_CPU, "cOCTDEV_DEVICES_TYPE_ENUM_CPU" },
 	{ 0,		NULL }
  };
 

application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octpkt_common.c

@@ -2,24 +2,26 @@
 
 File: octpkt_common.c
 
-Copyright (c) 2014 Octasic Inc. All rights reserved.
+      
+Copyright (c) 2015 Octasic Inc. All rights reserved.
 
 Description: Contain the wireshark module dissector related functions
 
-This program is free software; you can redistribute it and/or modify
+This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as published by
+it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
+the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-This program is distributed in the hope that it will be useful,
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27)
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Release: Octasic Application Development Framework OCTADF-01.00.01-B497 (2014/01/09)
 
 $Octasic_Revision: $
 
@@ -62,7 +64,6 @@ const value_string  vals_tOCTPKT_HDR_CONTROL_PROTOCOL_TYPE_ENUM[] =
 	{ cOCTPKT_HDR_CONTROL_PROTOCOL_TYPE_ENUM_OCTVOCNET, "cOCTPKT_HDR_CONTROL_PROTOCOL_TYPE_ENUM_OCTVOCNET" },
 	{ cOCTPKT_HDR_CONTROL_PROTOCOL_TYPE_ENUM_OCTMFA, "cOCTPKT_HDR_CONTROL_PROTOCOL_TYPE_ENUM_OCTMFA" },
 	{ cOCTPKT_HDR_CONTROL_PROTOCOL_TYPE_ENUM_LTE_FAPI, "cOCTPKT_HDR_CONTROL_PROTOCOL_TYPE_ENUM_LTE_FAPI" },
-	{ cOCTPKT_HDR_CONTROL_PROTOCOL_TYPE_ENUM_OCTSDR, "cOCTPKT_HDR_CONTROL_PROTOCOL_TYPE_ENUM_OCTSDR" },
 	{ cOCTPKT_HDR_CONTROL_PROTOCOL_TYPE_ENUM_TEST, "cOCTPKT_HDR_CONTROL_PROTOCOL_TYPE_ENUM_TEST" },
 	{ cOCTPKT_HDR_CONTROL_PROTOCOL_TYPE_ENUM_NONE, "cOCTPKT_HDR_CONTROL_PROTOCOL_TYPE_ENUM_NONE" },
 	{ 0,		NULL }

application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvc1_cid_eid_value_string.c

@@ -2,24 +2,25 @@
 
 File: OCTVC1_cid_eid_value_string.c
 
-Copyright (c) 2014 Octasic Inc. All rights reserved.
+Copyright (c) 2015 Octasic Inc. All rights reserved.
 
 Description: Contain the wireshark value_string of all CID and EID
 
-This program is free software; you can redistribute it and/or modify
+This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as published by
+it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
+the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-This program is distributed in the hope that it will be useful,
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27)
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Release: Octasic Application Development Framework OCTADF-01.00.01-B497 (2014/01/09)
 
 $Octasic_Revision: $
 
@@ -33,9 +34,12 @@ $Octasic_Revision: $
 #include "../include/module.h"
 #include "../include/octvc1_common.h"
 
-#include <main/octvc1_main_evt.h>
+#include <main/octvc1_main_evt_priv.h>
-#include <ctrl/octvc1_ctrl_api.h>
+#include <ctrl/octvc1_ctrl_api_priv.h>
-#include <gsm/octvc1_gsm_evt.h>
+#include <test/octvc1_test_api_priv.h>
+#include <hw/octvc1_hw_evt_priv.h>
+#include <irsc/octvc1_irsc_evt_priv.h>
+#include <gsm/octvc1_gsm_evt_priv.h>
 
 
 /****************************************************************************
@@ -44,7 +48,10 @@ $Octasic_Revision: $
 const value_string vals_OCTVC1_module_UID[] =
 {
 	{ (cOCTVC1_MAIN_UID),                                        "MAIN" },
-	{ (cOCTVC1_CTRL_UID),                                        "CTRL" },	
+	{ (cOCTVC1_CTRL_UID),                                        "CTRL" },
+	{ (cOCTVC1_TEST_UID),                                        "TEST" },
+	{ (cOCTVC1_HW_UID),                                          "HW" },
+	{ (cOCTVC1_IRSC_UID),                                        "IRSC" },
 	{ (cOCTVC1_GSM_UID),                                         "GSM" },
 	{ 0,		NULL },
 };
@@ -54,32 +61,8 @@ const value_string vals_OCTVC1_module_UID[] =
  ****************************************************************************/
 const value_string vals_OCTVC1_MAIN_CID[] =
 {
-	{ (cOCTVC1_MAIN_MSG_MODULE_MODIFY_EVT_CID& 0x00000FFF),               "MODULE_MODIFY_EVT" },
+	{ (cOCTVC1_MAIN_MSG_TARGET_INFO_CID& 0x00000FFF),                     "TARGET_INFO" },
-	{ (cOCTVC1_MAIN_MSG_MODULE_INFO_EVT_CID& 0x00000FFF),                 "MODULE_INFO_EVT" },
+	{ (cOCTVC1_MAIN_MSG_TARGET_RESET_CID& 0x00000FFF),                    "TARGET_RESET" },
-	{ (cOCTVC1_MAIN_MSG_MODULE_START_TRACING_CID& 0x00000FFF),            "MODULE_START_TRACING" },
-	{ (cOCTVC1_MAIN_MSG_MODULE_STOP_TRACING_CID& 0x00000FFF),             "MODULE_STOP_TRACING" },
-	{ (cOCTVC1_MAIN_MSG_BUFFER_OPEN_CID& 0x00000FFF),                     "BUFFER_OPEN" },
-	{ (cOCTVC1_MAIN_MSG_BUFFER_CLOSE_CID& 0x00000FFF),                    "BUFFER_CLOSE" },
-	{ (cOCTVC1_MAIN_MSG_BUFFER_INFO_CID& 0x00000FFF),                     "BUFFER_INFO" },
-	{ (cOCTVC1_MAIN_MSG_BUFFER_LIST_CID& 0x00000FFF),                     "BUFFER_LIST" },
-	{ (cOCTVC1_MAIN_MSG_BUFFER_MODIFY_CID& 0x00000FFF),                   "BUFFER_MODIFY" },
-	{ (cOCTVC1_MAIN_MSG_BUFFER_WRITE_CID& 0x00000FFF),                    "BUFFER_WRITE" },
-	{ (cOCTVC1_MAIN_MSG_BUFFER_READ_CID& 0x00000FFF),                     "BUFFER_READ" },
-	{ (cOCTVC1_MAIN_MSG_BUFFER_INFO_BY_NAME_CID& 0x00000FFF),             "BUFFER_INFO_BY_NAME" },
-	{ (cOCTVC1_MAIN_MSG_DEVICE_INFO_CID& 0x00000FFF),                     "DEVICE_INFO" },
-	{ (cOCTVC1_MAIN_MSG_DEVICE_RESET_CID& 0x00000FFF),                    "DEVICE_RESET" },
-	{ (cOCTVC1_MAIN_MSG_DEVICE_STATUS_OPUS_CORE_CID& 0x00000FFF),         "DEVICE_STATUS_OPUS_CORE" },
-	{ (cOCTVC1_MAIN_MSG_DEVICE_INFO_OPUS_CORE_CID& 0x00000FFF),           "DEVICE_INFO_OPUS_CORE" },
-	{ (cOCTVC1_MAIN_MSG_OCT1010_INFO_CID& 0x00000FFF),                    "OCT1010_INFO" },
-	{ (cOCTVC1_MAIN_MSG_OCT1010_RESET_CID& 0x00000FFF),                   "OCT1010_RESET" },
-	{ (cOCTVC1_MAIN_MSG_OCT1010_STATS_CID& 0x00000FFF),                   "OCT1010_STATS" },
-	{ (cOCTVC1_MAIN_MSG_OCT1010_STATUS_CORE_CID& 0x00000FFF),             "OCT1010_STATUS_CORE" },
-	{ (cOCTVC1_MAIN_MSG_OCT1010_INFO_CORE_CID& 0x00000FFF),               "OCT1010_INFO_CORE" },
-	{ (cOCTVC1_MAIN_MSG_OCT1010_INFO_OCT1010ID_CID& 0x00000FFF),          "OCT1010_INFO_OCT1010ID" },
-	{ (cOCTVC1_MAIN_MSG_ETH_STATS_CID& 0x00000FFF),                       "ETH_STATS" },	
-	{ (cOCTVC1_MAIN_MSG_ETH_MODIFY_PORT_CONFIG_CID& 0x00000FFF),          "ETH_MODIFY_PORT_CONFIG" },
-	{ (cOCTVC1_MAIN_MSG_ETH_INFO_PORT_CONFIG_CID& 0x00000FFF),            "ETH_INFO_PORT_CONFIG" },
-	{ (cOCTVC1_MAIN_MSG_REGISTER_READ_CID& 0x00000FFF),                   "REGISTER_READ" },
 	{ (cOCTVC1_MAIN_MSG_FILE_OPEN_CID& 0x00000FFF),                       "FILE_OPEN" },
 	{ (cOCTVC1_MAIN_MSG_FILE_CLOSE_CID& 0x00000FFF),                      "FILE_CLOSE" },
 	{ (cOCTVC1_MAIN_MSG_FILE_WRITE_CID& 0x00000FFF),                      "FILE_WRITE" },
@@ -89,33 +72,32 @@ const value_string vals_OCTVC1_MAIN_CID[] =
 	{ (cOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_CID& 0x00000FFF),                "FILE_SYSTEM_INFO" },
 	{ (cOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_CID& 0x00000FFF),           "FILE_SYSTEM_INFO_FILE" },
 	{ (cOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_CID& 0x00000FFF),         "FILE_SYSTEM_DELETE_FILE" },
-	{ (cOCTVC1_MAIN_MSG_LOG_ERASE_CID& 0x00000FFF),                       "LOG_ERASE" },	
+	{ (cOCTVC1_MAIN_MSG_LOG_ERASE_CID& 0x00000FFF),                       "LOG_ERASE" },
-	{ (cOCTVC1_MAIN_MSG_LOG_READ_ENTRY_CID& 0x00000FFF),                  "LOG_READ_ENTRY" },
+	{ (cOCTVC1_MAIN_MSG_LOG_INFO_CID& 0x00000FFF),                        "LOG_INFO" },
-	{ (cOCTVC1_MAIN_MSG_LICENSING_INFO_CID& 0x00000FFF),                  "LICENSING_INFO" },
+	{ (cOCTVC1_MAIN_MSG_LOG_STATS_CID& 0x00000FFF),                       "LOG_STATS" },
-	{ (cOCTVC1_MAIN_MSG_GPIO_READ_BANK_CID& 0x00000FFF),                  "GPIO_READ_BANK" },
+	{ (cOCTVC1_MAIN_MSG_LOG_INFO_TRACE_CID& 0x00000FFF),                  "LOG_INFO_TRACE" },
-	{ (cOCTVC1_MAIN_MSG_GPIO_WRITE_BANK_CID& 0x00000FFF),                 "GPIO_WRITE_BANK" },
+	{ (cOCTVC1_MAIN_MSG_LOG_START_TRACE_CID& 0x00000FFF),                 "LOG_START_TRACE" },
-	{ (cOCTVC1_MAIN_MSG_GPIO_MONITOR_BANK_CID& 0x00000FFF),               "GPIO_MONITOR_BANK" },
+	{ (cOCTVC1_MAIN_MSG_LOG_STOP_TRACE_CID& 0x00000FFF),                  "LOG_STOP_TRACE" },
-	{ (cOCTVC1_MAIN_MSG_GPIO_MODIFY_BANK_CONFIG_CID& 0x00000FFF),         "GPIO_MODIFY_BANK_CONFIG" },
+	{ (cOCTVC1_MAIN_MSG_LOG_ERASE_TRACE_CID& 0x00000FFF),                 "LOG_ERASE_TRACE" },
-	{ (cOCTVC1_MAIN_MSG_SPI_ACCESS_CID& 0x00000FFF),                      "SPI_ACCESS" },
+	{ (cOCTVC1_MAIN_MSG_LOG_STATS_TRACE_CID& 0x00000FFF),                 "LOG_STATS_TRACE" },
-	{ (cOCTVC1_MAIN_MSG_MDIO_READ_PHY_CID& 0x00000FFF),                   "MDIO_READ_PHY" },
-	{ (cOCTVC1_MAIN_MSG_MDIO_WRITE_PHY_CID& 0x00000FFF),                  "MDIO_WRITE_PHY" },
-	{ (cOCTVC1_MAIN_MSG_MDIO_MONITOR_PHY_CID& 0x00000FFF),                "MDIO_MONITOR_PHY" },
 	{ (cOCTVC1_MAIN_MSG_PROCESS_INFO_CID& 0x00000FFF),                    "PROCESS_INFO" },
 	{ (cOCTVC1_MAIN_MSG_PROCESS_LIST_CID& 0x00000FFF),                    "PROCESS_LIST" },
 	{ (cOCTVC1_MAIN_MSG_PROCESS_MONITOR_CPU_USAGE_CID& 0x00000FFF),       "PROCESS_MONITOR_CPU_USAGE" },
-	{ (cOCTVC1_MAIN_MSG_PROCESS_INFO_CPU_USAGE_CID& 0x00000FFF),          "PROCESS_INFO_CPU_USAGE" },	
+	{ (cOCTVC1_MAIN_MSG_PROCESS_INFO_CPU_USAGE_CID& 0x00000FFF),          "PROCESS_INFO_CPU_USAGE" },
-	{ (cOCTVC1_MAIN_MSG_DEBUG_FORWARD_OPEN_CID& 0x00000FFF),              "DEBUG_FORWARD_OPEN" },
+	{ (cOCTVC1_MAIN_MSG_PROCESS_STATS_CPU_USAGE_CID& 0x00000FFF),         "PROCESS_STATS_CPU_USAGE" },
-	{ (cOCTVC1_MAIN_MSG_DEBUG_FORWARD_CLOSE_CID& 0x00000FFF),             "DEBUG_FORWARD_CLOSE" },
+	{ (cOCTVC1_MAIN_MSG_API_SYSTEM_LIST_SESSION_CID& 0x00000FFF),         "API_SYSTEM_LIST_SESSION" },
-	{ (cOCTVC1_MAIN_MSG_DEBUG_FORWARD_INFO_CID& 0x00000FFF),              "DEBUG_FORWARD_INFO" },
+	{ (cOCTVC1_MAIN_MSG_API_SYSTEM_INFO_SESSION_CID& 0x00000FFF),         "API_SYSTEM_INFO_SESSION" },
-	{ (cOCTVC1_MAIN_MSG_REDUNDANCY_SERVER_START_CID& 0x00000FFF),         "REDUNDANCY_SERVER_START" },
+	{ (cOCTVC1_MAIN_MSG_API_SYSTEM_INFO_SESSION_EVT_CID& 0x00000FFF),     "API_SYSTEM_INFO_SESSION_EVT" },
-	{ (cOCTVC1_MAIN_MSG_REDUNDANCY_SERVER_STOP_CID& 0x00000FFF),          "REDUNDANCY_SERVER_STOP" },
+	{ (cOCTVC1_MAIN_MSG_API_SYSTEM_MODIFY_SESSION_EVT_CID& 0x00000FFF),   "API_SYSTEM_MODIFY_SESSION_EVT" },
-	{ (cOCTVC1_MAIN_MSG_REDUNDANCY_SERVER_INFO_CID& 0x00000FFF),          "REDUNDANCY_SERVER_INFO" },
+	{ (cOCTVC1_MAIN_MSG_API_SYSTEM_INFO_SESSION_HEARTBEAT_CID& 0x00000FFF), "API_SYSTEM_INFO_SESSION_HEARTBEAT" },
-	{ (cOCTVC1_MAIN_MSG_REDUNDANCY_SERVER_ADD_MGW_CID& 0x00000FFF),       "REDUNDANCY_SERVER_ADD_MGW" },
+	{ (cOCTVC1_MAIN_MSG_API_SYSTEM_STATS_SESSION_HEARTBEAT_CID& 0x00000FFF), "API_SYSTEM_STATS_SESSION_HEARTBEAT" },
-	{ (cOCTVC1_MAIN_MSG_REDUNDANCY_SERVER_REMOVE_MGW_CID& 0x00000FFF),    "REDUNDANCY_SERVER_REMOVE_MGW" },
+	{ (cOCTVC1_MAIN_MSG_API_SYSTEM_START_SESSION_HEARTBEAT_CID& 0x00000FFF), "API_SYSTEM_START_SESSION_HEARTBEAT" },
-	{ (cOCTVC1_MAIN_MSG_REDUNDANCY_SERVER_LIST_MGW_CID& 0x00000FFF),      "REDUNDANCY_SERVER_LIST_MGW" },
+	{ (cOCTVC1_MAIN_MSG_API_SYSTEM_STOP_SESSION_HEARTBEAT_CID& 0x00000FFF), "API_SYSTEM_STOP_SESSION_HEARTBEAT" },
-	{ (cOCTVC1_MAIN_MSG_REDUNDANCY_SERVER_INFO_MGW_CID& 0x00000FFF),      "REDUNDANCY_SERVER_INFO_MGW" },
+	{ (cOCTVC1_MAIN_MSG_API_SYSTEM_MODIFY_SESSION_HEARTBEAT_CID& 0x00000FFF), "API_SYSTEM_MODIFY_SESSION_HEARTBEAT" },
-	{ (cOCTVC1_MAIN_MSG_REDUNDANCY_SERVER_EXECUTE_MGW_FAILOVER_CID& 0x00000FFF), "REDUNDANCY_SERVER_EXECUTE_MGW_FAILOVER" },
+	{ (cOCTVC1_MAIN_MSG_APPLICATION_START_CID& 0x00000FFF),               "APPLICATION_START" },
-	{ (cOCTVC1_MAIN_MSG_OCT2200_STATS_CID& 0x00000FFF),                   "OCT2200_STATS" },
+	{ (cOCTVC1_MAIN_MSG_APPLICATION_STOP_CID& 0x00000FFF),                "APPLICATION_STOP" },
+	{ (cOCTVC1_MAIN_MSG_APPLICATION_INFO_CID& 0x00000FFF),                "APPLICATION_INFO" },
+	{ (cOCTVC1_MAIN_MSG_APPLICATION_INFO_SYSTEM_CID& 0x00000FFF),         "APPLICATION_INFO_SYSTEM" },
 	{ 0,		NULL },
 };
 const value_string vals_OCTVC1_MAIN_CID_PRIV[] =
@@ -130,34 +112,175 @@ const value_string vals_OCTVC1_CTRL_CID_PRIV[] =
 {
 	{ 0,		NULL },
 };
+const value_string vals_OCTVC1_TEST_CID[] =
+{
+	{ (cOCTVC1_TEST_MSG_DESCR_LIST_CID& 0x00000FFF),                      cOCTVC1_PRIVATE_ID_STRING },
+	{ (cOCTVC1_TEST_MSG_DESCR_INFO_CID& 0x00000FFF),                      cOCTVC1_PRIVATE_ID_STRING },
+	{ (cOCTVC1_TEST_MSG_DESCR_INFO_BY_NAME_CID& 0x00000FFF),              cOCTVC1_PRIVATE_ID_STRING },
+	{ (cOCTVC1_TEST_MSG_DESCR_STATS_CID& 0x00000FFF),                     cOCTVC1_PRIVATE_ID_STRING },
+	{ (cOCTVC1_TEST_MSG_RUNNER_SERVER_INFO_CID& 0x00000FFF),              cOCTVC1_PRIVATE_ID_STRING },
+	{ (cOCTVC1_TEST_MSG_RUNNER_SERVER_STATS_CID& 0x00000FFF),             cOCTVC1_PRIVATE_ID_STRING },
+	{ (cOCTVC1_TEST_MSG_RUNNER_SERVER_START_CID& 0x00000FFF),             cOCTVC1_PRIVATE_ID_STRING },
+	{ (cOCTVC1_TEST_MSG_RUNNER_SERVER_STOP_CID& 0x00000FFF),              cOCTVC1_PRIVATE_ID_STRING },
+	{ (cOCTVC1_TEST_MSG_RUNNER_SERVER_ADD_TEST_CID& 0x00000FFF),          cOCTVC1_PRIVATE_ID_STRING },
+	{ (cOCTVC1_TEST_MSG_RUNNER_SERVER_REMOVE_TEST_CID& 0x00000FFF),       cOCTVC1_PRIVATE_ID_STRING },
+	{ (cOCTVC1_TEST_MSG_RUNNER_SERVER_LIST_TEST_CID& 0x00000FFF),         cOCTVC1_PRIVATE_ID_STRING },
+	{ (cOCTVC1_TEST_MSG_RUNNER_SERVER_INFO_TEST_CID& 0x00000FFF),         cOCTVC1_PRIVATE_ID_STRING },
+	{ (cOCTVC1_TEST_MSG_RUNNER_SERVER_STATS_TEST_CID& 0x00000FFF),        cOCTVC1_PRIVATE_ID_STRING },
+	{ (cOCTVC1_TEST_MSG_RUNNER_SERVER_START_TEST_CID& 0x00000FFF),        cOCTVC1_PRIVATE_ID_STRING },
+	{ (cOCTVC1_TEST_MSG_RUNNER_SERVER_STOP_TEST_CID& 0x00000FFF),         cOCTVC1_PRIVATE_ID_STRING },
+	{ 0,		NULL },
+};
+const value_string vals_OCTVC1_TEST_CID_PRIV[] =
+{
+	{ (cOCTVC1_TEST_MSG_DESCR_LIST_CID& 0x00000FFF),                      "DESCR_LIST:" \
+						cOCTVC1_PRIVATE_VISIBILITY_USER \
+						","},
+	{ (cOCTVC1_TEST_MSG_DESCR_INFO_CID& 0x00000FFF),                      "DESCR_INFO:" \
+						cOCTVC1_PRIVATE_VISIBILITY_USER \
+						","},
+	{ (cOCTVC1_TEST_MSG_DESCR_INFO_BY_NAME_CID& 0x00000FFF),              "DESCR_INFO_BY_NAME:" \
+						cOCTVC1_PRIVATE_VISIBILITY_USER \
+						","},
+	{ (cOCTVC1_TEST_MSG_DESCR_STATS_CID& 0x00000FFF),                     "DESCR_STATS:" \
+						cOCTVC1_PRIVATE_VISIBILITY_USER \
+						","},
+	{ (cOCTVC1_TEST_MSG_RUNNER_SERVER_INFO_CID& 0x00000FFF),              "RUNNER_SERVER_INFO:" \
+						cOCTVC1_PRIVATE_VISIBILITY_USER \
+						","},
+	{ (cOCTVC1_TEST_MSG_RUNNER_SERVER_STATS_CID& 0x00000FFF),             "RUNNER_SERVER_STATS:" \
+						cOCTVC1_PRIVATE_VISIBILITY_USER \
+						","},
+	{ (cOCTVC1_TEST_MSG_RUNNER_SERVER_START_CID& 0x00000FFF),             "RUNNER_SERVER_START:" \
+						cOCTVC1_PRIVATE_VISIBILITY_USER \
+						","},
+	{ (cOCTVC1_TEST_MSG_RUNNER_SERVER_STOP_CID& 0x00000FFF),              "RUNNER_SERVER_STOP:" \
+						cOCTVC1_PRIVATE_VISIBILITY_USER \
+						","},
+	{ (cOCTVC1_TEST_MSG_RUNNER_SERVER_ADD_TEST_CID& 0x00000FFF),          "RUNNER_SERVER_ADD_TEST:" \
+						cOCTVC1_PRIVATE_VISIBILITY_USER \
+						","},
+	{ (cOCTVC1_TEST_MSG_RUNNER_SERVER_REMOVE_TEST_CID& 0x00000FFF),       "RUNNER_SERVER_REMOVE_TEST:" \
+						cOCTVC1_PRIVATE_VISIBILITY_USER \
+						","},
+	{ (cOCTVC1_TEST_MSG_RUNNER_SERVER_LIST_TEST_CID& 0x00000FFF),         "RUNNER_SERVER_LIST_TEST:" \
+						cOCTVC1_PRIVATE_VISIBILITY_USER \
+						","},
+	{ (cOCTVC1_TEST_MSG_RUNNER_SERVER_INFO_TEST_CID& 0x00000FFF),         "RUNNER_SERVER_INFO_TEST:" \
+						cOCTVC1_PRIVATE_VISIBILITY_USER \
+						","},
+	{ (cOCTVC1_TEST_MSG_RUNNER_SERVER_STATS_TEST_CID& 0x00000FFF),        "RUNNER_SERVER_STATS_TEST:" \
+						cOCTVC1_PRIVATE_VISIBILITY_USER \
+						","},
+	{ (cOCTVC1_TEST_MSG_RUNNER_SERVER_START_TEST_CID& 0x00000FFF),        "RUNNER_SERVER_START_TEST:" \
+						cOCTVC1_PRIVATE_VISIBILITY_USER \
+						","},
+	{ (cOCTVC1_TEST_MSG_RUNNER_SERVER_STOP_TEST_CID& 0x00000FFF),         "RUNNER_SERVER_STOP_TEST:" \
+						cOCTVC1_PRIVATE_VISIBILITY_USER \
+						","},
+	{ 0,		NULL },
+};
+const value_string vals_OCTVC1_HW_CID[] =
+{
+	{ (cOCTVC1_HW_MSG_PCB_INFO_CID& 0x00000FFF),                          "PCB_INFO" },
+	{ (cOCTVC1_HW_MSG_CPU_CORE_STATS_CID& 0x00000FFF),                    "CPU_CORE_STATS" },
+	{ (cOCTVC1_HW_MSG_CPU_CORE_INFO_CID& 0x00000FFF),                     "CPU_CORE_INFO" },
+	{ (cOCTVC1_HW_MSG_CPU_CORE_LIST_CID& 0x00000FFF),                     "CPU_CORE_LIST" },
+	{ (cOCTVC1_HW_MSG_ETH_PORT_INFO_CID& 0x00000FFF),                     "ETH_PORT_INFO" },
+	{ (cOCTVC1_HW_MSG_ETH_PORT_LIST_CID& 0x00000FFF),                     "ETH_PORT_LIST" },
+	{ (cOCTVC1_HW_MSG_ETH_PORT_STATS_CID& 0x00000FFF),                    "ETH_PORT_STATS" },
+	{ (cOCTVC1_HW_MSG_ETH_PORT_RESTRICTED_UNBLOCK_CID& 0x00000FFF),       cOCTVC1_PRIVATE_ID_STRING },
+	{ (cOCTVC1_HW_MSG_ETH_PORT_MODIFY_CID& 0x00000FFF),                   "ETH_PORT_MODIFY" },
+	{ (cOCTVC1_HW_MSG_RF_PORT_INFO_CID& 0x00000FFF),                      "RF_PORT_INFO" },
+	{ (cOCTVC1_HW_MSG_RF_PORT_STATS_CID& 0x00000FFF),                     "RF_PORT_STATS" },
+	{ (cOCTVC1_HW_MSG_RF_PORT_LIST_CID& 0x00000FFF),                      "RF_PORT_LIST" },
+	{ (cOCTVC1_HW_MSG_RF_PORT_LIST_ANTENNA_CID& 0x00000FFF),              "RF_PORT_LIST_ANTENNA" },
+	{ (cOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_RX_CONFIG_CID& 0x00000FFF),    "RF_PORT_INFO_ANTENNA_RX_CONFIG" },
+	{ (cOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CID& 0x00000FFF),  "RF_PORT_MODIFY_ANTENNA_RX_CONFIG" },
+	{ (cOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_TX_CONFIG_CID& 0x00000FFF),    "RF_PORT_INFO_ANTENNA_TX_CONFIG" },
+	{ (cOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CID& 0x00000FFF),  "RF_PORT_MODIFY_ANTENNA_TX_CONFIG" },
+	{ (cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_CID& 0x00000FFF),               "CLOCK_SYNC_MGR_INFO" },
+	{ (cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_CID& 0x00000FFF),              "CLOCK_SYNC_MGR_STATS" },
+	{ (cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_CID& 0x00000FFF),        "CLOCK_SYNC_MGR_INFO_SOURCE" },
+	{ (cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SOURCE_CID& 0x00000FFF),      "CLOCK_SYNC_MGR_MODIFY_SOURCE" },
+	{ (cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_START_SYNCHRO_CID& 0x00000FFF),      cOCTVC1_PRIVATE_ID_STRING },
+	{ (cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STOP_SYNCHRO_CID& 0x00000FFF),       cOCTVC1_PRIVATE_ID_STRING },
+	{ 0,		NULL },
+};
+const value_string vals_OCTVC1_HW_CID_PRIV[] =
+{
+	{ (cOCTVC1_HW_MSG_ETH_PORT_RESTRICTED_UNBLOCK_CID& 0x00000FFF),       "ETH_PORT_RESTRICTED_UNBLOCK:" \
+						cOCTVC1_PRIVATE_VISIBILITY_USER \
+						","},
+	{ (cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_START_SYNCHRO_CID& 0x00000FFF),      "CLOCK_SYNC_MGR_START_SYNCHRO:" \
+						cOCTVC1_PRIVATE_VISIBILITY_USER \
+						","},
+	{ (cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STOP_SYNCHRO_CID& 0x00000FFF),       "CLOCK_SYNC_MGR_STOP_SYNCHRO:" \
+						cOCTVC1_PRIVATE_VISIBILITY_USER \
+						","},
+	{ 0,		NULL },
+};
+const value_string vals_OCTVC1_IRSC_CID[] =
+{
+	{ (cOCTVC1_IRSC_MSG_PROCESS_INFO_CID& 0x00000FFF),                    "PROCESS_INFO" },
+	{ (cOCTVC1_IRSC_MSG_PROCESS_STATS_CID& 0x00000FFF),                   "PROCESS_STATS" },
+	{ (cOCTVC1_IRSC_MSG_PROCESS_LIST_CID& 0x00000FFF),                    "PROCESS_LIST" },
+	{ (cOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_CID& 0x00000FFF),           "PROCESS_INFO_IPC_PORT" },
+	{ (cOCTVC1_IRSC_MSG_PROCESS_STATS_IPC_PORT_CID& 0x00000FFF),          "PROCESS_STATS_IPC_PORT" },
+	{ (cOCTVC1_IRSC_MSG_PROCESS_LIST_IPC_PORT_CID& 0x00000FFF),           "PROCESS_LIST_IPC_PORT" },
+	{ (cOCTVC1_IRSC_MSG_PROCESS_INFO_TASK_CID& 0x00000FFF),               "PROCESS_INFO_TASK" },
+	{ (cOCTVC1_IRSC_MSG_PROCESS_STATS_TASK_CID& 0x00000FFF),              "PROCESS_STATS_TASK" },
+	{ (cOCTVC1_IRSC_MSG_PROCESS_LIST_TASK_CID& 0x00000FFF),               "PROCESS_LIST_TASK" },
+	{ (cOCTVC1_IRSC_MSG_OBJMGR_INFO_CID& 0x00000FFF),                     "OBJMGR_INFO" },
+	{ (cOCTVC1_IRSC_MSG_OBJMGR_STATS_CID& 0x00000FFF),                    "OBJMGR_STATS" },
+	{ (cOCTVC1_IRSC_MSG_OBJMGR_LIST_CID& 0x00000FFF),                     "OBJMGR_LIST" },
+	{ (cOCTVC1_IRSC_MSG_API_SYSTEM_START_MONITORING_CID& 0x00000FFF),     "API_SYSTEM_START_MONITORING" },
+	{ (cOCTVC1_IRSC_MSG_API_SYSTEM_STOP_MONITORING_CID& 0x00000FFF),      "API_SYSTEM_STOP_MONITORING" },
+	{ (cOCTVC1_IRSC_MSG_API_SYSTEM_LIST_COMMAND_CID& 0x00000FFF),         "API_SYSTEM_LIST_COMMAND" },
+	{ (cOCTVC1_IRSC_MSG_API_SYSTEM_STATS_COMMAND_CID& 0x00000FFF),        "API_SYSTEM_STATS_COMMAND" },
+	{ (cOCTVC1_IRSC_MSG_API_SYSTEM_LIST_SESSION_CID& 0x00000FFF),         "API_SYSTEM_LIST_SESSION" },
+	{ (cOCTVC1_IRSC_MSG_API_SYSTEM_INFO_SESSION_CID& 0x00000FFF),         "API_SYSTEM_INFO_SESSION" },
+	{ (cOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_CID& 0x00000FFF),        "API_SYSTEM_STATS_SESSION" },
+	{ (cOCTVC1_IRSC_MSG_API_SYSTEM_INFO_SESSION_EVT_CID& 0x00000FFF),     "API_SYSTEM_INFO_SESSION_EVT" },
+	{ (cOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_EVT_CID& 0x00000FFF),    "API_SYSTEM_STATS_SESSION_EVT" },
+	{ 0,		NULL },
+};
+const value_string vals_OCTVC1_IRSC_CID_PRIV[] =
+{
+	{ 0,		NULL },
+};
 const value_string vals_OCTVC1_GSM_CID[] =
 {
-	{ (cOCTVC1_GSM_MSG_MODULE_INFO_HARDWARE_CID& 0x00000FFF),             "MODULE_INFO_HARDWARE" },
+	{ (cOCTVC1_GSM_MSG_TRX_OPEN_CID& 0x00000FFF),                         "TRX_OPEN" },
-	{ (cOCTVC1_GSM_MSG_MODULE_MODIFY_EVT_CID& 0x00000FFF),                "MODULE_MODIFY_EVT" },
+	{ (cOCTVC1_GSM_MSG_TRX_CLOSE_CID& 0x00000FFF),                        "TRX_CLOSE" },
-	{ (cOCTVC1_GSM_MSG_MODULE_INFO_EVT_CID& 0x00000FFF),                  "MODULE_INFO_EVT" },
-	{ (cOCTVC1_GSM_MSG_MODULE_INFO_CID& 0x00000FFF),                      "MODULE_INFO" },
-	{ (cOCTVC1_GSM_MSG_PROCESS_UNIT_MODIFY_EVT_CID& 0x00000FFF),          "PROCESS_UNIT_MODIFY_EVT" },
-	{ (cOCTVC1_GSM_MSG_PROCESS_UNIT_INFO_EVT_CID& 0x00000FFF),            "PROCESS_UNIT_INFO_EVT" },
-	{ (cOCTVC1_GSM_MSG_PROCESS_UNIT_LIST_CID& 0x00000FFF),                "PROCESS_UNIT_LIST" },
-	{ (cOCTVC1_GSM_MSG_PROCESS_UNIT_INFO_CID& 0x00000FFF),                "PROCESS_UNIT_INFO" },
-	{ (cOCTVC1_GSM_MSG_PROCESS_UNIT_STATS_CID& 0x00000FFF),               "PROCESS_UNIT_STATS" },
-	{ (cOCTVC1_GSM_MSG_PHYSICAL_CHANNEL_REQUEST_EMPTY_FRAME_CID& 0x00000FFF), "PHYSICAL_CHANNEL_REQUEST_EMPTY_FRAME" },
-	{ (cOCTVC1_GSM_MSG_PHYSICAL_CHANNEL_REQUEST_DATA_CID& 0x00000FFF),    "PHYSICAL_CHANNEL_REQUEST_DATA" },
-	{ (cOCTVC1_GSM_MSG_PHYSICAL_CHANNEL_CONFIGURE_CIPHERING_CID& 0x00000FFF), "PHYSICAL_CHANNEL_CONFIGURE_CIPHERING" },
-	{ (cOCTVC1_GSM_MSG_PHYSICAL_CHANNEL_CONNECT_CID& 0x00000FFF),         "PHYSICAL_CHANNEL_CONNECT" },
-	{ (cOCTVC1_GSM_MSG_PHYSICAL_CHANNEL_DISCONNECT_CID& 0x00000FFF),      "PHYSICAL_CHANNEL_DISCONNECT" },
-	{ (cOCTVC1_GSM_MSG_PHYSICAL_CHANNEL_RESET_CID& 0x00000FFF),           "PHYSICAL_CHANNEL_RESET" },
-	{ (cOCTVC1_GSM_MSG_LOGICAL_CHANNEL_ACTIVATE_CID& 0x00000FFF),         "LOGICAL_CHANNEL_ACTIVATE" },
-	{ (cOCTVC1_GSM_MSG_LOGICAL_CHANNEL_DEACTIVATE_CID& 0x00000FFF),       "LOGICAL_CHANNEL_DEACTIVATE" },
-	{ (cOCTVC1_GSM_MSG_TRX_STATUS_TIMESLOT_CID& 0x00000FFF),              "TRX_STATUS_TIMESLOT" },
-	{ (cOCTVC1_GSM_MSG_TRX_REQUEST_TIMESLOT_MEASUREMENT_REPORT_CID& 0x00000FFF), "TRX_REQUEST_TIMESLOT_MEASUREMENT_REPORT" },
-	{ (cOCTVC1_GSM_MSG_TRX_RESET_CID& 0x00000FFF),                        "TRX_RESET" },
 	{ (cOCTVC1_GSM_MSG_TRX_STATUS_CID& 0x00000FFF),                       "TRX_STATUS" },
-	{ (cOCTVC1_GSM_MSG_TRX_CONFIGURE_CID& 0x00000FFF),                    "TRX_CONFIGURE" },
+	{ (cOCTVC1_GSM_MSG_TRX_INFO_CID& 0x00000FFF),                         "TRX_INFO" },
-	{ (cOCTVC1_GSM_MSG_TEST_START_ETSI_CID& 0x00000FFF),                  "TEST_START_ETSI" },
+	{ (cOCTVC1_GSM_MSG_TRX_RESET_CID& 0x00000FFF),                        "TRX_RESET" },
-	{ (cOCTVC1_GSM_MSG_TEST_END_ETSI_CID& 0x00000FFF),                    "TEST_END_ETSI" },
+	{ (cOCTVC1_GSM_MSG_TRX_MODIFY_CID& 0x00000FFF),                       "TRX_MODIFY" },
-	{ (cOCTVC1_GSM_MSG_TEST_START_FCC_CID& 0x00000FFF),                   "TEST_START_FCC" },
+	{ (cOCTVC1_GSM_MSG_TRX_LIST_CID& 0x00000FFF),                         "TRX_LIST" },
-	{ (cOCTVC1_GSM_MSG_TEST_END_FCC_CID& 0x00000FFF),                     "TEST_END_FCC" },
+	{ (cOCTVC1_GSM_MSG_TRX_CLOSE_ALL_CID& 0x00000FFF),                    "TRX_CLOSE_ALL" },
+	{ (cOCTVC1_GSM_MSG_TRX_START_RECORD_CID& 0x00000FFF),                 "TRX_START_RECORD" },
+	{ (cOCTVC1_GSM_MSG_TRX_STOP_RECORD_CID& 0x00000FFF),                  "TRX_STOP_RECORD" },
+	{ (cOCTVC1_GSM_MSG_TRX_INFO_RF_CID& 0x00000FFF),                      "TRX_INFO_RF" },
+	{ (cOCTVC1_GSM_MSG_TRX_MODIFY_RF_CID& 0x00000FFF),                    "TRX_MODIFY_RF" },
+	{ (cOCTVC1_GSM_MSG_TRX_ACTIVATE_LOGICAL_CHANNEL_CID& 0x00000FFF),     "TRX_ACTIVATE_LOGICAL_CHANNEL" },
+	{ (cOCTVC1_GSM_MSG_TRX_DEACTIVATE_LOGICAL_CHANNEL_CID& 0x00000FFF),   "TRX_DEACTIVATE_LOGICAL_CHANNEL" },
+	{ (cOCTVC1_GSM_MSG_TRX_STATUS_LOGICAL_CHANNEL_CID& 0x00000FFF),       "TRX_STATUS_LOGICAL_CHANNEL" },
+	{ (cOCTVC1_GSM_MSG_TRX_INFO_LOGICAL_CHANNEL_CID& 0x00000FFF),         "TRX_INFO_LOGICAL_CHANNEL" },
+	{ (cOCTVC1_GSM_MSG_TRX_LIST_LOGICAL_CHANNEL_CID& 0x00000FFF),         "TRX_LIST_LOGICAL_CHANNEL" },
+	{ (cOCTVC1_GSM_MSG_TRX_START_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS_CID& 0x00000FFF), "TRX_START_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS" },
+	{ (cOCTVC1_GSM_MSG_TRX_STOP_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS_CID& 0x00000FFF), "TRX_STOP_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS" },
+	{ (cOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_EMPTY_FRAME_CID& 0x00000FFF), "TRX_REQUEST_LOGICAL_CHANNEL_EMPTY_FRAME" },
+	{ (cOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_DATA_CID& 0x00000FFF), "TRX_REQUEST_LOGICAL_CHANNEL_DATA" },
+	{ (cOCTVC1_GSM_MSG_TRX_ACTIVATE_PHYSICAL_CHANNEL_CID& 0x00000FFF),    "TRX_ACTIVATE_PHYSICAL_CHANNEL" },
+	{ (cOCTVC1_GSM_MSG_TRX_DEACTIVATE_PHYSICAL_CHANNEL_CID& 0x00000FFF),  "TRX_DEACTIVATE_PHYSICAL_CHANNEL" },
+	{ (cOCTVC1_GSM_MSG_TRX_STATUS_PHYSICAL_CHANNEL_CID& 0x00000FFF),      "TRX_STATUS_PHYSICAL_CHANNEL" },
+	{ (cOCTVC1_GSM_MSG_TRX_RESET_PHYSICAL_CHANNEL_CID& 0x00000FFF),       "TRX_RESET_PHYSICAL_CHANNEL" },
+	{ (cOCTVC1_GSM_MSG_TRX_LIST_PHYSICAL_CHANNEL_CID& 0x00000FFF),        "TRX_LIST_PHYSICAL_CHANNEL" },
+	{ (cOCTVC1_GSM_MSG_TRX_INFO_PHYSICAL_CHANNEL_CID& 0x00000FFF),        "TRX_INFO_PHYSICAL_CHANNEL" },
+	{ (cOCTVC1_GSM_MSG_TRX_MODIFY_PHYSICAL_CHANNEL_CIPHERING_CID& 0x00000FFF), "TRX_MODIFY_PHYSICAL_CHANNEL_CIPHERING" },
+	{ (cOCTVC1_GSM_MSG_TRX_INFO_PHYSICAL_CHANNEL_CIPHERING_CID& 0x00000FFF), "TRX_INFO_PHYSICAL_CHANNEL_CIPHERING" },
+	{ (cOCTVC1_GSM_MSG_TRX_INFO_PHYSICAL_CHANNEL_MEASUREMENT_CID& 0x00000FFF), "TRX_INFO_PHYSICAL_CHANNEL_MEASUREMENT" },
 	{ 0,		NULL },
 };
 const value_string vals_OCTVC1_GSM_CID_PRIV[] =
@@ -170,13 +293,10 @@ const value_string vals_OCTVC1_GSM_CID_PRIV[] =
  ****************************************************************************/
 const value_string vals_OCTVC1_MAIN_EID[] =
 {
-	{ (cOCTVC1_MAIN_MSG_MODULE_TRACING_BUFFER_FULL_EID& 0x0000FFFF),      "MODULE_TRACING_BUFFER_FULL" },
-	{ (cOCTVC1_MAIN_MSG_MODULE_TRACING_STOP_EID& 0x0000FFFF),             "MODULE_TRACING_STOP" },
-	{ (cOCTVC1_MAIN_MSG_DEVICE_OPUS_CORE_EXEC_REPORT_EID& 0x0000FFFF),    "DEVICE_OPUS_CORE_EXEC_REPORT" },
-	{ (cOCTVC1_MAIN_MSG_GPIO_BANK_CHANGE_EID& 0x0000FFFF),                "GPIO_BANK_CHANGE" },
-	{ (cOCTVC1_MAIN_MSG_MDIO_PHY_CHANGE_EID& 0x0000FFFF),                 "MDIO_PHY_CHANGE" },
 	{ (cOCTVC1_MAIN_MSG_PROCESS_CPU_USAGE_REPORT_EID& 0x0000FFFF),        "PROCESS_CPU_USAGE_REPORT" },
-	{ (cOCTVC1_MAIN_MSG_REDUNDANCY_SERVER_MGW_FAILOVER_DONE_EID& 0x0000FFFF), "REDUNDANCY_SERVER_MGW_FAILOVER_DONE" },
+	{ (cOCTVC1_MAIN_MSG_PROCESS_DUMP_EID& 0x0000FFFF),                    "PROCESS_DUMP" },
+	{ (cOCTVC1_MAIN_MSG_API_SYSTEM_SESSION_HEARTBEAT_EID& 0x0000FFFF),    "API_SYSTEM_SESSION_HEARTBEAT" },
+	{ (cOCTVC1_MAIN_MSG_APPLICATION_STATE_CHANGE_EID& 0x0000FFFF),        "APPLICATION_STATE_CHANGE" },
 	{ 0,		NULL },
 };
 
@@ -193,22 +313,44 @@ const value_string vals_OCTVC1_CTRL_EID_PRIV[] =
 {
 	{ 0,		NULL },
 };
+const value_string vals_OCTVC1_TEST_EID[] =
+{
+	{ 0,		NULL },
+};
+
+const value_string vals_OCTVC1_TEST_EID_PRIV[] =
+{
+	{ 0,		NULL },
+};
+const value_string vals_OCTVC1_HW_EID[] =
+{
+	{ (cOCTVC1_HW_MSG_CPU_CORE_EXEC_REPORT_EID& 0x0000FFFF),              "CPU_CORE_EXEC_REPORT" },
+	{ (cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATUS_CHANGE_EID& 0x0000FFFF),      "CLOCK_SYNC_MGR_STATUS_CHANGE" },
+	{ 0,		NULL },
+};
+
+const value_string vals_OCTVC1_HW_EID_PRIV[] =
+{
+	{ 0,		NULL },
+};
+const value_string vals_OCTVC1_IRSC_EID[] =
+{
+	{ (cOCTVC1_IRSC_MSG_PROCESS_DUMP_EID& 0x0000FFFF),                    "PROCESS_DUMP" },
+	{ 0,		NULL },
+};
+
+const value_string vals_OCTVC1_IRSC_EID_PRIV[] =
+{
+	{ 0,		NULL },
+};
 const value_string vals_OCTVC1_GSM_EID[] =
 {
-	{ (cOCTVC1_GSM_MSG_MODULE_TIME_INDICATION_EID& 0x0000FFFF),           "MODULE_TIME_INDICATION" },
+	{ (cOCTVC1_GSM_MSG_TRX_LOGICAL_CHANNEL_DATA_INDICATION_EID& 0x0000FFFF), "TRX_LOGICAL_CHANNEL_DATA_INDICATION" },
-	{ (cOCTVC1_GSM_MSG_MODULE_DATA_INDICATION_EID& 0x0000FFFF),           "MODULE_DATA_INDICATION" },
+	{ (cOCTVC1_GSM_MSG_TRX_LOGICAL_CHANNEL_READY_TO_SEND_INDICATION_EID& 0x0000FFFF), "TRX_LOGICAL_CHANNEL_READY_TO_SEND_INDICATION" },
-	{ (cOCTVC1_GSM_MSG_MODULE_TRX_RADIO_READY_EID& 0x0000FFFF),           "MODULE_TRX_RADIO_READY" },
+	{ (cOCTVC1_GSM_MSG_TRX_LOGICAL_CHANNEL_RACH_INDICATION_EID& 0x0000FFFF), "TRX_LOGICAL_CHANNEL_RACH_INDICATION" },
-	{ (cOCTVC1_GSM_MSG_MODULE_READY_TO_SEND_INDICATION_EID& 0x0000FFFF),  "MODULE_READY_TO_SEND_INDICATION" },
+	{ (cOCTVC1_GSM_MSG_TRX_LOGICAL_CHANNEL_RAW_DATA_INDICATION_EID& 0x0000FFFF), "TRX_LOGICAL_CHANNEL_RAW_DATA_INDICATION" },
-	{ (cOCTVC1_GSM_MSG_MODULE_RACH_INDICATION_EID& 0x0000FFFF),           "MODULE_RACH_INDICATION" },
+	{ (cOCTVC1_GSM_MSG_TRX_TIME_INDICATION_EID& 0x0000FFFF),              "TRX_TIME_INDICATION" },
-	{ (cOCTVC1_GSM_MSG_MODULE_ERROR_EID& 0x0000FFFF),                     "MODULE_ERROR" },
+	{ (cOCTVC1_GSM_MSG_TRX_STATUS_CHANGE_EID& 0x0000FFFF),                "TRX_STATUS_CHANGE" },
-	{ (cOCTVC1_GSM_MSG_MODULE_MESSAGE_EID& 0x0000FFFF),                   "MODULE_MESSAGE" },
-	{ (cOCTVC1_GSM_MSG_MODULE_CHECKPOINT_EID& 0x0000FFFF),                "MODULE_CHECKPOINT" },
-	{ (cOCTVC1_GSM_MSG_MODULE_TRACING_EID& 0x0000FFFF),                   "MODULE_TRACING" },
-	{ (cOCTVC1_GSM_MSG_PROCESS_UNIT_ERROR_EID& 0x0000FFFF),               "PROCESS_UNIT_ERROR" },
-	{ (cOCTVC1_GSM_MSG_PROCESS_UNIT_MESSAGE_EID& 0x0000FFFF),             "PROCESS_UNIT_MESSAGE" },
-	{ (cOCTVC1_GSM_MSG_PROCESS_UNIT_CHECKPOINT_EID& 0x0000FFFF),          "PROCESS_UNIT_CHECKPOINT" },
-	{ (cOCTVC1_GSM_MSG_PROCESS_UNIT_TRACING_EID& 0x0000FFFF),             "PROCESS_UNIT_TRACING" },
-	{ (cOCTVC1_GSM_MSG_TEST_ETSI_TEST_REPORT_EID& 0x0000FFFF),            "TEST_ETSI_TEST_REPORT" },
 	{ 0,		NULL },
 };
 
@@ -239,6 +381,33 @@ const value_string vals_OCTVC1_CTRL_SID_PRIV[] =
 {
 	{ 0,		NULL },
 };
+const value_string vals_OCTVC1_TEST_SID[] =
+{
+	{ 0,		NULL },
+};
+
+const value_string vals_OCTVC1_TEST_SID_PRIV[] =
+{
+	{ 0,		NULL },
+};
+const value_string vals_OCTVC1_HW_SID[] =
+{
+	{ 0,		NULL },
+};
+
+const value_string vals_OCTVC1_HW_SID_PRIV[] =
+{
+	{ 0,		NULL },
+};
+const value_string vals_OCTVC1_IRSC_SID[] =
+{
+	{ 0,		NULL },
+};
+
+const value_string vals_OCTVC1_IRSC_SID_PRIV[] =
+{
+	{ 0,		NULL },
+};
 const value_string vals_OCTVC1_GSM_SID[] =
 {
 	{ 0,		NULL },
@@ -256,13 +425,22 @@ extern void ws_register_OCTVC1_MAIN(void);
 extern int ws_dissect_OCTVC1_MAIN( guint8 message_type, guint32 CID, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree );
 extern void ws_register_OCTVC1_CTRL(void);
 extern int ws_dissect_OCTVC1_CTRL( guint8 message_type, guint32 CID, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree );
+extern void ws_register_OCTVC1_TEST(void);
+extern int ws_dissect_OCTVC1_TEST( guint8 message_type, guint32 CID, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree );
+extern void ws_register_OCTVC1_HW(void);
+extern int ws_dissect_OCTVC1_HW( guint8 message_type, guint32 CID, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree );
+extern void ws_register_OCTVC1_IRSC(void);
+extern int ws_dissect_OCTVC1_IRSC( guint8 message_type, guint32 CID, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree );
 extern void ws_register_OCTVC1_GSM(void);
 extern int ws_dissect_OCTVC1_GSM( guint8 message_type, guint32 CID, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree );
 ;
 tModuleColInfo aOCTVC1ModuleColInfo[] =
 {
 	{ "MAIN", vals_OCTVC1_MAIN_CID,vals_OCTVC1_MAIN_EID,vals_OCTVC1_MAIN_SID, ws_register_OCTVC1_MAIN, ws_dissect_OCTVC1_MAIN,vals_OCTVC1_MAIN_CID_PRIV,vals_OCTVC1_MAIN_EID_PRIV },
-	{ "CTRL", vals_OCTVC1_CTRL_CID,vals_OCTVC1_CTRL_EID,vals_OCTVC1_CTRL_SID, ws_register_OCTVC1_CTRL, ws_dissect_OCTVC1_CTRL,vals_OCTVC1_CTRL_CID_PRIV,vals_OCTVC1_CTRL_EID_PRIV },	
+	{ "CTRL", vals_OCTVC1_CTRL_CID,vals_OCTVC1_CTRL_EID,vals_OCTVC1_CTRL_SID, ws_register_OCTVC1_CTRL, ws_dissect_OCTVC1_CTRL,vals_OCTVC1_CTRL_CID_PRIV,vals_OCTVC1_CTRL_EID_PRIV },
+	{ "TEST", vals_OCTVC1_TEST_CID,vals_OCTVC1_TEST_EID,vals_OCTVC1_TEST_SID, ws_register_OCTVC1_TEST, ws_dissect_OCTVC1_TEST,vals_OCTVC1_TEST_CID_PRIV,vals_OCTVC1_TEST_EID_PRIV },
+	{ "HW", vals_OCTVC1_HW_CID,vals_OCTVC1_HW_EID,vals_OCTVC1_HW_SID, ws_register_OCTVC1_HW, ws_dissect_OCTVC1_HW,vals_OCTVC1_HW_CID_PRIV,vals_OCTVC1_HW_EID_PRIV },
+	{ "IRSC", vals_OCTVC1_IRSC_CID,vals_OCTVC1_IRSC_EID,vals_OCTVC1_IRSC_SID, ws_register_OCTVC1_IRSC, ws_dissect_OCTVC1_IRSC,vals_OCTVC1_IRSC_CID_PRIV,vals_OCTVC1_IRSC_EID_PRIV },
 	{ "GSM", vals_OCTVC1_GSM_CID,vals_OCTVC1_GSM_EID,vals_OCTVC1_GSM_SID, ws_register_OCTVC1_GSM, ws_dissect_OCTVC1_GSM,vals_OCTVC1_GSM_CID_PRIV,vals_OCTVC1_GSM_EID_PRIV },
 
 };

application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvc1_module_ctrl.c

@@ -2,24 +2,26 @@
 
 File: octvc1_module_ctrl.c
 
-Copyright (c) 2014 Octasic Inc. All rights reserved.
+      
+Copyright (c) 2015 Octasic Inc. All rights reserved.
 
 Description: Contain the wireshark module dissector related functions
 
-This program is free software; you can redistribute it and/or modify
+This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as published by
+it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
+the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-This program is distributed in the hope that it will be useful,
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27)
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Release: Octasic Application Development Framework OCTADF-01.00.01-B497 (2014/01/09)
 
 $Octasic_Revision: $
 
@@ -33,7 +35,7 @@ $Octasic_Revision: $
 #include "../include/module.h"
 #include "../include/octvc1_common.h"
 
-#include <ctrl/octvc1_ctrl_api.h>
+#include <ctrl/octvc1_ctrl_api_priv.h>
 
 
 /****************************************************************************

application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvc1_msg_ctrl.c

@@ -1,30 +1,27 @@
-/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\
+/* octvc1_msg_ctrl.c
-
+ * Routines for vocallonet dissection
-File: octvc1_msg_ctrl.c
+ * Copyright 2004, Ocatasic inc.
-
+ *
-Copyright (c) 2014 Octasic Inc. All rights reserved.
+ * $Id: README.developer 11475 2004-07-23 01:37:35Z guy $
-
+ *
-Description: Routines for vocallonet dissection
+ * Ethereal - Network traffic analyzer
-
+ * By Gerald Combs <gerald@ethereal.com>
-This program is free software; you can redistribute it and/or modify
+ * Copyright 1998 Gerald Combs
-it under the terms of the GNU Affero General Public License as published by
+ * *
-the Free Software Foundation; either version 3 of the License, or
+ * This program is free software; you can redistribute it and/or
-(at your option) any later version.
+ * modify it under the terms of the GNU General Public License
-
+ * as published by the Free Software Foundation; either version 2
-This program is distributed in the hope that it will be useful,
+ * of the License, or (at your option) any later version.
-but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * This program is distributed in the hope that it will be useful,
-GNU General Public License for more details.
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-You should have received a copy of the GNU Affero General Public License
+ * GNU General Public License for more details.
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
-
+ * You should have received a copy of the GNU General Public License
-Release: Octasic Application Development Framework OCTADF-01.00.01-B497 (2014/01/09)
+ * along with this program; if not, write to the Free Software
-
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-$Octasic_Revision: $
+ */
-
-\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
-
 
 #include <config.h>
 #include <epan/packet.h>

application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvc1_msg_event.c

@@ -1,30 +1,28 @@
-/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\
+/* octvc1_msg_event.c
-
+ * Routines for vocallonet dissection
-File: octvc1_msg_event.c
+ * Copyright 2004, Ocatasic inc.
-
+ *
-Copyright (c) 2014 Octasic Inc. All rights reserved.
+ * $Id: README.developer 11475 2004-07-23 01:37:35Z guy $
-
+ *
-Description: Routines for vocallonet dissection
+ * Ethereal - Network traffic analyzer
-
+ * By Gerald Combs <gerald@ethereal.com>
-This program is free software; you can redistribute it and/or modify
+ * Copyright 1998 Gerald Combs
-it under the terms of the GNU Affero General Public License as published by
+ * *
-the Free Software Foundation; either version 3 of the License, or
+ * This program is free software; you can redistribute it and/or
-(at your option) any later version.
+ * modify it under the terms of the GNU General Public License
-
+ * as published by the Free Software Foundation; either version 2
-This program is distributed in the hope that it will be useful,
+ * of the License, or (at your option) any later version.
-but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * This program is distributed in the hope that it will be useful,
-GNU General Public License for more details.
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-You should have received a copy of the GNU Affero General Public License
+ * GNU General Public License for more details.
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
-
+ * You should have received a copy of the GNU General Public License
-Release: Octasic Application Development Framework OCTADF-01.00.01-B497 (2014/01/09)
+ * along with this program; if not, write to the Free Software
-
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-$Octasic_Revision: $
+ */
-
+#include <config.h>
-\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
- #include <config.h>
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>

application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvc1_plugin.c

@@ -1,30 +1,6 @@
-/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\
+/* octvc1_plugin.c
-
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-File: octvc1_plugin.c
+ */
-
-Copyright (c) 2014 Octasic Inc. All rights reserved.
-
-Description: 
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Release: Octasic Application Development Framework OCTADF-01.00.01-B497 (2014/01/09)
-
-$Octasic_Revision: $
-
-\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
-
 #include <string.h>
 
 #include <config.h>
@@ -36,7 +12,7 @@ $Octasic_Revision: $
 #include "../include/module.h"
 #define OCT_DECLARE_COMMON
 #include "../include/octvc1_common.h"
-#include <gsm/octvc1_gsm_api.h>
+
 
 static int proto_octvc1 = -1;
 static int fUserRegistered = 0;
@@ -54,283 +30,12 @@ dissector_handle_t data_handle;
 
 const gchar* octvc1_chck_private( guint32 f_id_code, const value_string *f_PrivateApi, gint32 *f_piRegistered )
 {
-	const gchar* pszValueString;
+return cOCTVC1_UNKNOWN_STRING;
-
-	//CHck if same as last request
-	if( l_iRegisteredUserLen && ( l_id_code_Registered == f_id_code ) )
-	{
-		*f_piRegistered = 1;
-		return l_szAPIStr;
-	}
-
-	*f_piRegistered = 0;
-	pszValueString = val_to_str( f_id_code, f_PrivateApi, cOCTVC1_UNKNOWN_STRING );
-	if( strcmp( pszValueString, cOCTVC1_UNKNOWN_STRING ) )
-	{
-		// Expect API ID STRING:user,user2,user3
-		gchar *pszColumn = strchr( pszValueString, ':' );
-		if( pszColumn )
-		{
-			gchar *pszStr;
-
-			// Keep API string
-			strncpy( l_szAPIStr, pszValueString, (pszColumn-pszValueString) );
-			l_szAPIStr[(pszColumn-pszValueString)]=0;
-
-			// Chck if god is register
-			if( !l_fIsGod )
-				pszStr = strstr( pszColumn+1, l_szRegisteredUser );
-
-			// Find if register for this
-			if( l_fIsGod ||
-				( pszStr && ((pszStr==(pszColumn+1)) || (*(pszStr-1)==',') ) && 
-				  ( (*(pszStr+l_iRegisteredUserLen)==',') || (*(pszStr+l_iRegisteredUserLen)==0 ) ) ) )
-			{
-				l_id_code_Registered = f_id_code;
-				*f_piRegistered = 1;
-				return l_szAPIStr;
-			}
-		}
-	}
-	return cOCTVC1_UNKNOWN_STRING;
 }
 
 void pref_proto_octvc1_apply_callback( void )
 {
-	char *pszPath;
-
-	// by default this callback is called at startup ... skip the first call
-	if( fUserRegistered )
-	{
-		int fReguser=0;
-
-		if( ( strcmp( pszOctvc1_user_name, cOCTVC1_GOD_USER ) == 0 ) &&
-			( strcmp( pszOctvc1_user_id, cOCTVC1_GOD_USER_ID ) == 0 ) )
-		{
-			fReguser = 1;
-			l_fIsGod = 1;
-		}
-		else
-		{
-			int i;
-
-			for( i=0; ; i++ )
-			{
-				if( aOCTVC1_user_list[i][0] == NULL )
-					break;
-
-				if( ( strcmp( aOCTVC1_user_list[i][0], pszOctvc1_user_name ) == 0 ) &&
-					( strcmp( aOCTVC1_user_list[i][1], pszOctvc1_user_id ) == 0 ) )
-				{
-					fReguser = 1;
-					l_fIsGod = 0;
-					break;
-				}
-			}
-		}
-
-		if( fReguser )
-		{
-			g_fIsRegistered = 1;
-			strcpy( l_szRegisteredUser, pszOctvc1_user_name  );
-			l_iRegisteredUserLen = strlen( l_szRegisteredUser );
-		}
-		else
-		{
-			g_fIsRegistered = 0;
-			l_fIsGod = 0;
-		}
-	}
-	fUserRegistered = 1;
-
-	prefs_set_pref( "octvc1.user_name:user" );
-	prefs_set_pref( "octvc1.user_id:****" );
-	write_prefs( &pszPath );
-
-	// Reset last check
-	l_id_code_Registered = 0;
-	l_szAPIStr[0] = 0;
-
-
-
 }
-
-extern tModuleColInfo aOCTVC1ModuleColInfo[];
-#define mWD_OCTVC1_CID_CODE(uint32)					((uint32) & 0x00000FFF)
-
-
-void dissect_OCTVC1_GSM(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
-{
-    int temp_data, ulMsgType, ulCommandId, ulOctvc1MsgType, remaining_length, module_index;
-    int offset = 0;
-    tvbuff_t *message_tvb;
-    const gchar*	pszValueString = NULL;
-    tModuleColInfo GsmModule;
-
-	/* Find Tbl Module Index */
-	match_strval_idx( cOCTVC1_GSM_UID, vals_OCTVC1_module_UID, &module_index );
-    
-    /*Get the proper module info */
-    GsmModule = aOCTVC1ModuleColInfo[module_index];
-    
-    temp_data = tvb_get_ntohs( tvb, offset );
-    proto_tree_add_text(tree, tvb, offset, 2, "reserved %d", temp_data );
-    offset += 2;
-    ulMsgType           = tvb_get_guint8( tvb, offset );
-    ulCommandId         = (ulMsgType & 0x7F) | cOCTVC1_GSM_CID_BASE;
-    ulOctvc1MsgType     = ((ulMsgType & 0x80) == 0 )? cOCTVC1_MSG_TYPE_RESPONSE: cOCTVC1_MSG_TYPE_COMMAND;
-    
-    /* Hardcoded event mapping */
-    if( ulMsgType == 0x01 ||  ulMsgType == 0x02 || ulMsgType == 0x07 ||  ulMsgType == 0x0e || ulMsgType == 0x16 )
-    {
-        ulOctvc1MsgType = cOCTVC1_MSG_TYPE_NOTIFICATION;
-        ulCommandId     = ulMsgType | cOCTVC1_GSM_EID_BASE;
-    }
-    
-    proto_tree_add_text(tree, tvb, offset, 1, "MsgType 0x%02x (CID:0x%08x, type:%d)", ulMsgType, ulCommandId, ulOctvc1MsgType );
-    offset += 1;
-    temp_data = tvb_get_guint8( tvb, offset );
-    proto_tree_add_text(tree, tvb, offset, 1, "size: %d", temp_data );
-    offset += 1; 
-    temp_data = tvb_get_ntohs( tvb, offset );
-    proto_tree_add_text(tree, tvb, offset, 2, "sequence %d", temp_data );
-    offset += 2;
-
-   if( (ulMsgType & 0x7F) == 0x00 )
-   {
-		ulCommandId |= 0x100;
-   }
-   /*API is not orthogonal!! remap response to proper Ids */
-   if( ulOctvc1MsgType == cOCTVC1_MSG_TYPE_RESPONSE )
-   {
-        if( ulMsgType == 0x08 ||  ulMsgType == 0x09 )
-             ulCommandId         = ((ulMsgType-1) & 0x7F) | cOCTVC1_GSM_CID_BASE;
-
-        if( ulMsgType == 0x0a )
-            ulCommandId         = (0x11) | cOCTVC1_GSM_CID_BASE;
-   }
-   
-   if( ulOctvc1MsgType == cOCTVC1_MSG_TYPE_COMMAND )
-   {
-        if( ulMsgType == 0x82 || ulMsgType == 0x81 )
-            ulCommandId |= cOCTVC1_MSG_NO_RESPONSE_FLAG;
-
-   }
-   
-   if( ulOctvc1MsgType == cOCTVC1_MSG_TYPE_NOTIFICATION )
-   {
-       pszValueString = val_to_str( mWD_OCTVC1_CID_CODE( ulCommandId), GsmModule.apEvtIdValueString, cOCTVC1_UNKNOWN_STRING );
-       
-   }else {
-   
-       pszValueString = val_to_str( mWD_OCTVC1_CID_CODE( ulCommandId), GsmModule.apCodeIdValueString, cOCTVC1_UNKNOWN_STRING );
-   }
-   
-   if ( check_col(pinfo->cinfo, COL_INFO) )
-   {
-        col_add_fstr( pinfo->cinfo, COL_INFO,
-                        "%s_MSG_%s(0x%04X)",
-                        GsmModule.pszModuleName,
-                        pszValueString,
-                        ulCommandId );
-    }
-      
-   
-   if ( check_col(pinfo->cinfo, COL_PROTOCOL) )
-        col_set_str(pinfo->cinfo, COL_PROTOCOL, "oct_gsm");
-       
-        
-   remaining_length = tvb_reported_length_remaining(tvb, offset);
-   message_tvb = tvb_new_subset(tvb, offset, remaining_length, remaining_length);
-   GsmModule.Dissector_fnc( ulOctvc1MsgType, ulCommandId, message_tvb, pinfo, tree);
-
-	/* We can call the amr plugin */
-	/* think it can support IF2 Frame (GPP TS 26.101), need to double check */
-}
-
-
-#ifdef cOCTVC1_WCDMA_UID
-void dissect_OCTVC1_WCDMA(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
-{
-    int temp_data, ulMsgType, ulCommandId, ulOctvc1MsgType, remaining_length, module_index;
-    int offset = 0;
-    tvbuff_t *message_tvb;
-    const gchar*	pszValueString = NULL;
-    tModuleColInfo WcdmaModule;
-
-	/* Find Tbl Module Index */
-	match_strval_idx( cOCTVC1_WCDMA_UID, vals_OCTVC1_module_UID, &module_index );
-    
-    /*Get the proper module info */
-    WcdmaModule = aOCTVC1ModuleColInfo[module_index];
-	ulMsgType	= 0;
-
-    ulOctvc1MsgType     = cOCTVC1_MSG_TYPE_COMMAND;
-    
-	temp_data = tvb_get_ntohs( tvb, offset );
-    proto_tree_add_text(tree, tvb, offset, 1, "L1c etherType 0x%02x", temp_data );
-    offset += 2;
-    temp_data = tvb_get_ntohs( tvb, offset );
-    proto_tree_add_text(tree, tvb, offset, 1, "Body Size: %d", temp_data );
-    offset += 2; 
-    temp_data = tvb_get_ntohs( tvb, offset );
-	proto_tree_add_text(tree, tvb, offset, 2, "Message Type: %d", temp_data );
-    offset += 2; 
-
-    temp_data = tvb_get_ntohs( tvb, offset );
-	proto_tree_add_text(tree, tvb, offset, 2, "Message Id: %d", temp_data );
-	ulCommandId         = (temp_data & 0x7F) | cOCTVC1_WCDMA_CID_BASE;
-
-    offset += 2; 
-    temp_data = tvb_get_guint8( tvb, offset );
-	proto_tree_add_text(tree, tvb, offset, 2, "FP Header size: %d", temp_data );
-    offset += 2; 
-	temp_data = tvb_get_guint8( tvb, offset );
-	proto_tree_add_text(tree, tvb, offset, 2, "Transaction Id: %d", temp_data );
-    offset += 2; 
-  
-   /*API is not orthogonal!! remap response to proper Ids */
-   if( ulOctvc1MsgType == cOCTVC1_MSG_TYPE_RESPONSE )
-   {
-        if( ulMsgType == 0x08 ||  ulMsgType == 0x09 )
-             ulCommandId         = ((ulMsgType-1) & 0x7F) | cOCTVC1_GSM_CID_BASE;
-
-        if( ulMsgType == 0x0a )
-            ulCommandId         = (0x11) | cOCTVC1_GSM_CID_BASE;
-   }
-
-   if( ulOctvc1MsgType == cOCTVC1_MSG_TYPE_NOTIFICATION )
-   {
-       pszValueString = val_to_str( mWD_OCTVC1_CID_CODE( ulCommandId), WcdmaModule.apEvtIdValueString, cOCTVC1_UNKNOWN_STRING );
-       
-   }else {
-   
-       pszValueString = val_to_str( mWD_OCTVC1_CID_CODE( ulCommandId), WcdmaModule.apCodeIdValueString, cOCTVC1_UNKNOWN_STRING );
-   }
-   
-   if ( check_col(pinfo->cinfo, COL_INFO) )
-   {
-        col_add_fstr( pinfo->cinfo, COL_INFO,
-                        "%s_MSG_%s(0x%04X)",
-                        WcdmaModule.pszModuleName,
-                        pszValueString,
-                        ulCommandId );
-    }
-      
-   
-   if ( check_col(pinfo->cinfo, COL_PROTOCOL) )
-        col_set_str(pinfo->cinfo, COL_PROTOCOL, "oct_wcdma");
-       
-        
-   remaining_length = tvb_reported_length_remaining(tvb, offset);
-   message_tvb = tvb_new_subset(tvb, offset, remaining_length, remaining_length);
-   WcdmaModule.Dissector_fnc( ulOctvc1MsgType, ulCommandId, message_tvb, pinfo, tree);
-
-	/* We can call the amr plugin */
-	/* think it can support IF2 Frame (GPP TS 26.101), need to double check */
-}
-#endif
-
 /*************************************************************************
 *
 *  Code to register the protocol with Wireshark
@@ -339,8 +44,6 @@ void dissect_OCTVC1_WCDMA(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 void proto_register_octvc1(void)
 {                 
 	module_t *octvc1_module;
-    int proto_gsm = -1;
-	int proto_wcdma = -1;
 
 	proto_octvc1 = proto_register_protocol(	"OCTVC1 Packets", "Octasic OCTVC1", "octvc1");
 	octvc1_module = prefs_register_protocol(proto_octvc1, pref_proto_octvc1_apply_callback);
@@ -355,23 +58,10 @@ void proto_register_octvc1(void)
 
 	/* Call module register fnc */
 	ws_register_dissector_module();
-    
-    
-    proto_gsm = proto_register_protocol(	"OCTASIC GSM MODULE", "OCTGSM", "oct_gsm");
-    register_dissector("OCTGSM", dissect_OCTVC1_GSM, proto_gsm);   
 
-#ifdef cOCTVC1_WCDMA_UID
-    proto_wcdma = proto_register_protocol(	"OCTASIC WCDMA MODULE", "OCTWCDMA", "oct_wcdma");
-    register_dissector("OCTWCDMA", dissect_OCTVC1_WCDMA, proto_wcdma);   
-#endif
-
-    
 }
 
 
-
-  
-
 /*************************************************************************
 *
 *  If this dissector uses sub-dissector registration add a registration routine.

application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvocnet_common.c

@@ -2,24 +2,26 @@
 
 File: octvocnet_common.c
 
-Copyright (c) 2014 Octasic Inc. All rights reserved.
+      
+Copyright (c) 2015 Octasic Inc. All rights reserved.
 
 Description: Contain the wireshark module dissector related functions
 
-This program is free software; you can redistribute it and/or modify
+This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as published by
+it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
+the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-This program is distributed in the hope that it will be useful,
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27)
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Release: Octasic Application Development Framework OCTADF-01.00.01-B497 (2014/01/09)
 
 $Octasic_Revision: $
 
@@ -45,57 +47,3 @@ const value_string  vals_tOCTVOCNET_PKT_CONTROL_PROTOCOL_TYPE_ENUM[] =
 	{ cOCTVOCNET_PKT_CONTROL_PROTOCOL_TYPE_ENUM_OCTVC1, "cOCTVOCNET_PKT_CONTROL_PROTOCOL_TYPE_ENUM_OCTVC1" },
 	{ 0,		NULL }
  };
-
-const value_string  vals_tOCTVOCNET_PKT_D_TYPE_ENUM[] = 
- {
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_TONE, "cOCTVOCNET_PKT_D_TYPE_ENUM_TONE" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_GEN_SID, "cOCTVOCNET_PKT_D_TYPE_ENUM_GEN_SID" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_LINEAR_8KSS, "cOCTVOCNET_PKT_D_TYPE_ENUM_LINEAR_8KSS" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_LINEAR_16KSS, "cOCTVOCNET_PKT_D_TYPE_ENUM_LINEAR_16KSS" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_PCM_U_LAW, "cOCTVOCNET_PKT_D_TYPE_ENUM_PCM_U_LAW" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_PCM_A_LAW, "cOCTVOCNET_PKT_D_TYPE_ENUM_PCM_A_LAW" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_PCM_U_LAW_VBD, "cOCTVOCNET_PKT_D_TYPE_ENUM_PCM_U_LAW_VBD" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_PCM_A_LAW_VBD, "cOCTVOCNET_PKT_D_TYPE_ENUM_PCM_A_LAW_VBD" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_G726_16, "cOCTVOCNET_PKT_D_TYPE_ENUM_G726_16" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_G726_24, "cOCTVOCNET_PKT_D_TYPE_ENUM_G726_24" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_G726_32, "cOCTVOCNET_PKT_D_TYPE_ENUM_G726_32" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_G726_40, "cOCTVOCNET_PKT_D_TYPE_ENUM_G726_40" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_G726_16_RTP, "cOCTVOCNET_PKT_D_TYPE_ENUM_G726_16_RTP" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_G726_24_RTP, "cOCTVOCNET_PKT_D_TYPE_ENUM_G726_24_RTP" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_G726_32_RTP, "cOCTVOCNET_PKT_D_TYPE_ENUM_G726_32_RTP" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_G726_40_RTP, "cOCTVOCNET_PKT_D_TYPE_ENUM_G726_40_RTP" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_G722_48, "cOCTVOCNET_PKT_D_TYPE_ENUM_G722_48" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_G722_56, "cOCTVOCNET_PKT_D_TYPE_ENUM_G722_56" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_G722_64, "cOCTVOCNET_PKT_D_TYPE_ENUM_G722_64" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_G723_1, "cOCTVOCNET_PKT_D_TYPE_ENUM_G723_1" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_G729A, "cOCTVOCNET_PKT_D_TYPE_ENUM_G729A" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_G729AB_8, "cOCTVOCNET_PKT_D_TYPE_ENUM_G729AB_8" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_AMR, "cOCTVOCNET_PKT_D_TYPE_ENUM_AMR" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_AMR_RTP, "cOCTVOCNET_PKT_D_TYPE_ENUM_AMR_RTP" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_EFR, "cOCTVOCNET_PKT_D_TYPE_ENUM_EFR" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_EFR_RTP, "cOCTVOCNET_PKT_D_TYPE_ENUM_EFR_RTP" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_FR, "cOCTVOCNET_PKT_D_TYPE_ENUM_FR" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_FR_RTP, "cOCTVOCNET_PKT_D_TYPE_ENUM_FR_RTP" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_AMR_WB, "cOCTVOCNET_PKT_D_TYPE_ENUM_AMR_WB" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_AMR_WB_RTP, "cOCTVOCNET_PKT_D_TYPE_ENUM_AMR_WB_RTP" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_ILBC, "cOCTVOCNET_PKT_D_TYPE_ENUM_ILBC" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_G722_1_24, "cOCTVOCNET_PKT_D_TYPE_ENUM_G722_1_24" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_G722_1_32, "cOCTVOCNET_PKT_D_TYPE_ENUM_G722_1_32" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_G729_1, "cOCTVOCNET_PKT_D_TYPE_ENUM_G729_1" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_G729_1_RTP, "cOCTVOCNET_PKT_D_TYPE_ENUM_G729_1_RTP" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_T38_UDPTL, "cOCTVOCNET_PKT_D_TYPE_ENUM_T38_UDPTL" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_T38_RTP, "cOCTVOCNET_PKT_D_TYPE_ENUM_T38_RTP" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_VOX, "cOCTVOCNET_PKT_D_TYPE_ENUM_VOX" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_YUV_RTP_RFC4175, "cOCTVOCNET_PKT_D_TYPE_ENUM_YUV_RTP_RFC4175" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_RAW_YUV, "cOCTVOCNET_PKT_D_TYPE_ENUM_RAW_YUV" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_RAW_RGB, "cOCTVOCNET_PKT_D_TYPE_ENUM_RAW_RGB" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_RAW_YUV_EXTENDED, "cOCTVOCNET_PKT_D_TYPE_ENUM_RAW_YUV_EXTENDED" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_H263_RTP_RFC2190, "cOCTVOCNET_PKT_D_TYPE_ENUM_H263_RTP_RFC2190" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_H263_RTP_RFC2190_BYTE_BOUNDARY, "cOCTVOCNET_PKT_D_TYPE_ENUM_H263_RTP_RFC2190_BYTE_BOUNDARY" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_H263_RTP_RFC2429, "cOCTVOCNET_PKT_D_TYPE_ENUM_H263_RTP_RFC2429" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_MPEG4_RTP_RFC3016, "cOCTVOCNET_PKT_D_TYPE_ENUM_MPEG4_RTP_RFC3016" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_H264_RTP_RFC3984, "cOCTVOCNET_PKT_D_TYPE_ENUM_H264_RTP_RFC3984" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_FAST_YUV, "cOCTVOCNET_PKT_D_TYPE_ENUM_FAST_YUV" },
-	{ cOCTVOCNET_PKT_D_TYPE_ENUM_UNKNOWN_RTP_PAYLOAD_TYPE, "cOCTVOCNET_PKT_D_TYPE_ENUM_UNKNOWN_RTP_PAYLOAD_TYPE" },
-	{ 0,		NULL }
- };

application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/plugin.c

@@ -1,29 +1,5 @@
-/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\
+/* Do not modify this file.  */
-
+/* It is created automatically by the Makefile.  */
-File: plugin.c
-
-Copyright (c) 2014 Octasic Inc. All rights reserved.
-
-Description: 
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Release: Octasic Application Development Framework OCTADF-01.00.01-B497 (2014/01/09)
-
-$Octasic_Revision: $
-
-\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"

application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/ws_util.c

@@ -1,29 +1,3 @@
-/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\
-
-File: ws_util.c
-
-Copyright (c) 2014 Octasic Inc. All rights reserved.
-
-Description: 
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Release: Octasic Application Development Framework OCTADF-01.00.01-B497 (2014/01/09)
-
-$Octasic_Revision: $
-
-\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
 /*****************************  INCLUDE FILES  *******************************/
 #include <config.h>

application/tool/wireshark/plugins/octasic/octsdr/octvocnet_ws/Makefile.am

@@ -0,0 +1,100 @@
+# Makefile.am
+
+OCT_INC = $(OCT_PATH)/software/include
+
+INCLUDES = -I$(top_srcdir) -I$(includedir) -I$(OCT_INC) -I$(OCT_INC)/octvc1 -I$(OCT_INC)/vocallo -I$(OCT_INC)/octpkt
+
+include Makefile.common
+
+AM_CFLAGS=-DTGT_VERSION=$(TGT_VERSION) -DMODULE_VERSION=$(MODULE_VERSION)
+
+plugindir = @plugindir@
+
+plugin_LTLIBRARIES = octvocnet_ws.la
+octvocnet_ws_la_SOURCES = \
+	source/plugin.c \
+	include/moduleinfo.h \
+	$(DISSECTOR_SRC) \
+	$(DISSECTOR_INCLUDES)
+octvocnet_ws_la_LDFLAGS = -module -avoid-version
+octvocnet_ws_la_LIBADD = @PLUGIN_LIBS@
+
+# Libs must be cleared, or else libtool won't create a shared module.
+# If your module needs to be linked against any particular libraries,
+# add them here.
+LIBS =
+
+#
+# Build plugin.c, which contains the plugin version[] string, a
+# function plugin_register() that calls the register routines for all
+# protocols, and a function plugin_reg_handoff() that calls the handoff
+# registration routines for all protocols.
+#
+# We do this by scanning sources.  If that turns out to be too slow,
+# maybe we could just require every .o file to have an register routine
+# of a given name (packet-aarp.o -> proto_register_aarp, etc.).
+#
+# Formatting conventions:  The name of the proto_register_* routines an
+# proto_reg_handoff_* routines must start in column zero, or must be
+# preceded only by "void " starting in column zero, and must not be
+# inside #if.
+#
+# DISSECTOR_SRC is assumed to have all the files that need to be scanned.
+#
+# For some unknown reason, having a big "for" loop in the Makefile
+# to scan all the files doesn't work with some "make"s; they seem to
+# pass only the first few names in the list to the shell, for some
+# reason.
+#
+# Therefore, we have a script to generate the plugin.c file.
+# The shell script runs slowly, as multiple greps and seds are run
+# for each input file; this is especially slow on Windows.  Therefore,
+# if Python is present (as indicated by PYTHON being defined), we run
+# a faster Python script to do that work instead.
+#
+# The first argument is the directory in which the source files live.
+# The second argument is "plugin", to indicate that we should build
+# a plugin.c file for a plugin.
+# All subsequent arguments are the files to scan.
+#
+plugin.c: $(DISSECTOR_SRC) $(top_srcdir)/tools/make-dissector-reg \
+    $(top_srcdir)/tools/make-dissector-reg.py
+	@if test -n "$(PYTHON)"; then \
+		echo Making plugin.c with python ; \
+		$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
+		    plugin $(DISSECTOR_SRC) ; \
+	else \
+		echo Making plugin.c with shell script ; \
+		$(top_srcdir)/tools/make-dissector-reg $(srcdir) \
+		    $(plugin_src) plugin $(DISSECTOR_SRC) ; \
+	fi
+
+#
+# Currently plugin.c can be included in the distribution because
+# we always build all protocol dissectors. We used to have to check
+# whether or not to build the snmp dissector. If we again need to
+# variably build something, making plugin.c non-portable, uncomment
+# the dist-hook line below.
+#
+# Oh, yuk.  We don't want to include "plugin.c" in the distribution, as
+# its contents depend on the configuration, and therefore we want it
+# to be built when the first "make" is done; however, Automake insists
+# on putting *all* source into the distribution.
+#
+# We work around this by having a "dist-hook" rule that deletes
+# "plugin.c", so that "dist" won't pick it up.
+#
+#dist-hook:
+#	@rm -f $(distdir)/plugin.c
+
+CLEANFILES = \
+	octvocnet_ws \
+	*~
+
+MAINTAINERCLEANFILES = \
+	Makefile.in	\
+	source/plugin.c
+
+EXTRA_DIST = \
+	Makefile.common		\
+	Makefile.nmake		

application/tool/wireshark/plugins/octasic/octsdr/octvocnet_ws/Makefile.common

@@ -0,0 +1,41 @@
+# Makefile.common for Gryphon plugin
+#     Contains the stuff from Makefile.am and Makefile.nmake that is
+#     a) common to both files and
+#     b) portable between both files
+#
+# $Id: Makefile.common 27491 2009-02-21 16:33:48Z jake $
+#
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
+# Copyright 1998 Gerald Combs
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+# the name of the plugin
+PLUGIN_NAME = octvocnet_ws
+
+# the dissector sources (without any helpers)
+DISSECTOR_SRC = \
+	source/packet-vocallonet.c \
+	source/octvocnet_common.c
+
+# corresponding headers
+DISSECTOR_INCLUDES =
+
+# Dissector helpers. They're included in the source files in this
+# directory, but they're not dissectors themselves, i.e. they're not
+# used to generate "plugin.c".
+DISSECTOR_SUPPORT_SRC =	
+	

application/tool/wireshark/plugins/octasic/octsdr/octvocnet_ws/Makefile.nmake

@@ -0,0 +1,45 @@
+# Makefile.nmake
+# nmake file for Wireshark plugin
+#
+# $Id: Makefile.nmake 24520 2008-03-01 12:31:01Z jake $
+#
+!IFNDEF WS_ROOT
+WS_ROOT=..\..\..
+!ENDIF
+
+!include $(WS_ROOT)\$(TGT_WS_VERSION)\config.nmake
+
+
+#
+# The RC_VERSION should be comma-separated, not dot-separated, 
+# as per Graham Bloice's message in
+#
+#	http://www.ethereal.com/lists/ethereal-dev/200303/msg00283.html
+#
+# "The RC_VERSION variable in config.nmake should be comma separated. 
+# This allows the resources to be built correctly and the version
+# number to be correctly displayed in the explorer properties dialog
+# for the executables, and XP's tooltip, rather than 0.0.0.0."
+#
+
+MODULE_VERSION=$(MODULE_VERSION_MAJOR)_$(MODULE_VERSION_MINOR)_$(MODULE_VERSION_MICRO)_$(MODULE_VERSION_EXTRA)
+RC_MODULE_VERSION=$(MODULE_VERSION_MAJOR),$(MODULE_VERSION_MINOR),$(MODULE_VERSION_MICRO),$(MODULE_VERSION_EXTRA)
+
+# the name of the plugin
+PLUGIN_NAME = octvocnet_ws
+
+
+# the dissector sources (without any helpers)
+SRC_PATH=source 
+DISSECTOR_SRC = source/packet-vocallonet.c \
+			source/octvocnet_common.c
+
+!IF "$(TGT_VERSION)" != ""
+LOCAL_CFLAGS=/DTGT_VERSION=$(TGT_VERSION) /DMODULE_VERSION=$(MODULE_VERSION) $(LOCAL_CFLAGS) 
+RC_INTERNAL_NAME="Base on $(PACKAGE) version $(TGT_VERSION)"
+!ELSE
+LOCAL_CFLAGS=/DMODULE_VERSION=$(MODULE_VERSION) $(LOCAL_CFLAGS)
+RC_INTERNAL_NAME="Base on $(PACKAGE) version $(MODULE_VERSION)"
+!ENDIF
+
+!include ..\..\MakeRules.nmake

application/tool/wireshark/plugins/octasic/octsdr/octvocnet_ws/include/module.h

@@ -0,0 +1,40 @@
+/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\
+
+File: module.h
+
+Copyright (c) 2015 Octasic Inc. All rights reserved.
+
+Description:	Wireshark module
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Release: Octasic Application Development Framework OCTADF-03.03.00-B1571 (2015/03/24)
+
+$Octasic_Revision: 4 $
+
+
+\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
+#ifndef __MODULE_H__
+#define __MODULE_H__
+
+/*****************************  INCLUDE FILES  *******************************/
+#include <epan/packet.h>
+
+
+/*****************************  INCLUDES *************************************/
+/*****************************  DEFINES **************************************/
+/*****************************  PROTO **************************************/
+
+#endif /* __MODULE_H__ */

application/tool/wireshark/plugins/octasic/octsdr/octvocnet_ws/include/moduleinfo.h

@@ -0,0 +1,30 @@
+/* Included *after* config.h, in order to re-define these macros */
+#include "../../../include/oct_ws_version.h"
+
+#ifdef PACKAGE
+#undef PACKAGE
+#endif
+
+/* Name of package */
+#define PACKAGE "vocallonet"
+
+
+#ifdef VERSION
+#undef VERSION
+#endif
+
+#ifndef MODULE_VERSION
+#define MODULE_VERSION 0_0_1_DEV
+#endif
+
+#define _QUOTEME(x) #x
+#define QUOTEME(x) _QUOTEME(x)
+
+/* Version number of package */
+/* WAS : #if !defined( TGT_VERSION ) || (TGT_VERSION == 0) but TGT_VERSION may be a string ... can't compare */
+#if defined( NO_TGT_VERSION )
+#define VERSION QUOTEME(MODULE_VERSION)
+#else
+#define VERSION QUOTEME(MODULE_VERSION-TGT_VERSION)
+#endif
+

application/tool/wireshark/plugins/octasic/octsdr/octvocnet_ws/include/octvocnet_common.h

@@ -0,0 +1,42 @@
+/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\
+
+File: octvocnet_common.h
+
+      
+Copyright (c) 2015 Octasic Inc. All rights reserved.
+
+Description: Contain the wireshark module dissector related functions
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27)
+
+$Octasic_Revision: $
+
+\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
+
+/*****************************  INCLUDE FILES  *******************************/
+#ifndef _OCTVOCNET_COMMON_H__
+#define _OCTVOCNET_COMMON_H__
+
+#include <epan/packet.h>
+
+/****************************************************************************
+	COMMON API ENUMERATION STRING VALUES
+ ****************************************************************************/
+extern const value_string  vals_tOCTVOCNET_PKT_CONTROL_PROTOCOL_TYPE_ENUM[]; 
+
+#endif /* _OCTVOCNET_COMMON_H__ */
+

application/tool/wireshark/plugins/octasic/octsdr/octvocnet_ws/source/octvocnet.rc

@@ -0,0 +1,34 @@
+#include "winver.h"
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,0,1,0
+ PRODUCTVERSION 1,0,1,0
+ FILEFLAGSMASK 0x0L
+#ifdef _DEBUG
+ FILEFLAGS VS_FF_DEBUG
+#else
+ FILEFLAGS 0
+#endif
+ FILEOS VOS_NT_WINDOWS32
+ FILETYPE VFT_DLL
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", "Octasic, http://www.octasic.com/\0"
+            VALUE "FileDescription", "octvocnet dissector\0"
+            VALUE "FileVersion", "1.0.1.2\0"
+            VALUE "InternalName", "Base on OCTVC1 1.3.0.x-PR\0"
+            VALUE "LegalCopyright", "Copyright © 2009 Octasic\0"
+            VALUE "OriginalFilename", "octvocnet.dll\0"
+            VALUE "ProductName", "Wireshark\0"
+            VALUE "ProductVersion", "1.0.1\0"
+            VALUE "Comments", "Build with MSVC6\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END

application/tool/wireshark/plugins/octasic/octsdr/octvocnet_ws/source/octvocnet_common.c

@@ -0,0 +1,49 @@
+/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\
+
+File: octvocnet_common.c
+
+      
+Copyright (c) 2015 Octasic Inc. All rights reserved.
+
+Description: Contain the wireshark module dissector related functions
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27)
+
+$Octasic_Revision: $
+
+\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
+
+/*****************************  INCLUDE FILES  *******************************/
+
+#include <config.h>
+#include <epan/packet.h>
+#include "../../../include/oct_ws_macro.h"
+#include "../include/module.h"
+#include "../include/octvocnet_common.h"
+
+
+#include <octvocnet_pkt.h>
+
+/****************************************************************************
+	MODULE API ENUMERATION STRING VALUES
+ ****************************************************************************/
+
+const value_string  vals_tOCTVOCNET_PKT_CONTROL_PROTOCOL_TYPE_ENUM[] = 
+ {
+	{ cOCTVOCNET_PKT_CONTROL_PROTOCOL_TYPE_ENUM_OCTVC1, "cOCTVOCNET_PKT_CONTROL_PROTOCOL_TYPE_ENUM_OCTVC1" },
+	{ 0,		NULL }
+ };

application/tool/wireshark/plugins/octasic/octsdr/octvocnet_ws/source/plugin.c

@@ -0,0 +1,38 @@
+/* Do not modify this file.  */
+/* It is created automatically by the Makefile.  */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+
+#include <gmodule.h>
+
+#include "../include/moduleinfo.h"
+
+#ifndef ENABLE_STATIC
+
+#if defined(VERSION_MAJOR) && (VERSION_MAJOR > 1 || (VERSION_MAJOR == 1 && VERSION_MINOR > 8))
+#define WS_BUILD_DLL
+#include "ws_symbol_export.h"
+#define WS_EXPORT WS_DLL_PUBLIC_NOEXTERN
+#else
+#define WS_EXPORT G_MODULE_EXPORT	
+#endif
+
+WS_EXPORT const gchar version[] = VERSION;
+
+/* Start the functions we need for the plugin stuff */
+WS_EXPORT void
+plugin_register (void)
+{
+  {extern void proto_register_vocallonet (void); proto_register_vocallonet ();}
+}
+
+WS_EXPORT void
+plugin_reg_handoff(void)
+{
+  {extern void proto_reg_handoff_vocallonet (void); proto_reg_handoff_vocallonet ();}
+}
+#endif
+

application/tool/wireshark/ws_dev_root.nmake

@@ -1 +0,0 @@
-WS_DEV_ROOT=Y:\work\3rdParty\wireshark 

makefile.nmake

@@ -0,0 +1,46 @@
+
+      
+TGT_WS_VERSION=1.6.5
+MODULE_VERSION_MAJOR=1
+MODULE_VERSION_MINOR=0
+MODULE_VERSION_MICRO=0
+MODULE_VERSION_EXTRA=0
+
+#update to proper path
+WS_DEV_ROOT=\work\3rdParty\wireshark
+
+all: setup_m
+  @cd "application\tool\wireshark\plugins\octasic\octpkt_ws"
+  @$(MAKE) /NOLOGO /$(MAKEFLAGS) -f makefile.nmake
+  @cd $(MAKEDIR)
+  @cd "application\tool\wireshark\plugins\octasic\octsdr"
+  @$(MAKE) /NOLOGO /$(MAKEFLAGS) -f makefile.nmake
+  @cd $(MAKEDIR)
+
+clean: setup_m
+  @cd "application\tool\wireshark\plugins\octasic\octpkt_ws"
+  @$(MAKE) /NOLOGO /$(MAKEFLAGS) -f makefile.nmake clean
+  @cd $(MAKEDIR)  
+  @cd "application\tool\wireshark\plugins\octasic\octsdr"
+  @$(MAKE) /NOLOGO /$(MAKEFLAGS) -f makefile.nmake clean
+  @cd $(MAKEDIR)
+
+
+install: setup_m
+  @cd "application\tool\wireshark\plugins\octasic\octpkt_ws"
+  @$(MAKE) /NOLOGO /$(MAKEFLAGS) -f makefile.nmake install
+  @cd $(MAKEDIR)
+  @cd "application\tool\wireshark\plugins\octasic\octsdr"
+  @$(MAKE) /NOLOGO /$(MAKEFLAGS) -f makefile.nmake install
+  @cd $(MAKEDIR)
+
+setup_m:
+  @echo Expecting Wireshark development framework in: $(WS_DEV_ROOT)
+  @SET TGT_WS_VERSION=$(TGT_WS_VERSION)
+  @SET MODULE_VERSION_MAJOR=$(MODULE_VERSION_MAJOR)
+  @SET MODULE_VERSION_MINOR=$(MODULE_VERSION_MINOR)
+  @SET MODULE_VERSION_MICRO=$(MODULE_VERSION_MICRO)
+  @SET MODULE_VERSION_EXTRA=$(MODULE_VERSION_EXTRA)
+  @SET WS_DEV_ROOT=$(WS_DEV_ROOT) 
+      
+    

readme.txt

@@ -1,7 +1,14 @@
-GSM Wireshark Plugin Source Code
 
-This source code works with Wireshark version 1.6.5.
+      
+Wireshark Source Code Package for "OCTSDR_GSM" Plugins.
 
-Makefile for octvc1 plugin is located in application\tool\wireshark\plugins\octasic\octsdr
+Requirement: 
+  - Microsoft Visual C++ 2008 Express Edition
+  - Wireshark development framework version 1.6.5 
+      Expecting path is: "\work\3rdParty\wireshark". 
+      To change location, edit the file Makefile.nmake and change the WS_DEV_ROOT definition.
 
-Makefile for octpkt_ws plugin is located in application\tool\wireshark\plugins\octasic\octpkt_ws
+To make the plugins: nmake -f Makefile.nmake
+
+      
+    

software/include/octdev_devices.h

@@ -2,13 +2,25 @@
 
 File: OCTDEV_DEVICES.h
 
-Copyright (c) 2014 Octasic Inc. All rights reserved.
+Copyright (c) 2015 Octasic Inc. All rights reserved.
 
 Description: 
 
-This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.

You should have received a copy of the GNU Affero General Public License
along with this program.  If not, see <http://www.gnu.org/licenses/>.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-Octasic_Release: OCTSDR-2G-01.08.05-B29-ALPHA (2014/08/14)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27)
 
 $Revision: $
 
@@ -32,6 +44,7 @@ $Revision: $
 #define cOCTDEV_DEVICES_TYPE_ENUM_INVALID					0x0		
 #define cOCTDEV_DEVICES_TYPE_ENUM_OCT1010					0x1		
 #define cOCTDEV_DEVICES_TYPE_ENUM_OCT2200					0x2		
+#define cOCTDEV_DEVICES_TYPE_ENUM_CPU						0xF		
 
 /*-------------------------------------------------------------------------------------
 	tOCTDEV_DEVICES_DSP_CORE_TYPE_ENUM : 	Octasic DSP Core type.

software/include/octdev_devices_swap.h

@@ -0,0 +1,63 @@
+/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
+
+File: octdev_devices_swap.h	
+
+Copyright (c) 2015 Octasic Inc. All rights reserved.	
+
+Description:	
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.	
+
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27)	
+
+\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/	
+#ifndef __OCTDEV_DEVICES_SWAP_H__
+#define __OCTDEV_DEVICES_SWAP_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*****************************  INCLUDE FILES  *******************************/
+#include "octvc1/octvc1_swap_hdrs.h"
+#include "octdev_devices.h"
+
+/*********************************  MACROS  **********************************/
+
+
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTDEV_DEVICES_TYPE_ENUM_SWAP( pType ){ \
+		*((tOCT_UINT32 *)pType) = mOCT_SWAP32_IF_LE( *((tOCT_UINT32 *)pType) ); }
+#else
+
+#define mOCTDEV_DEVICES_TYPE_ENUM_SWAP( pType )
+
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTDEV_DEVICES_DSP_CORE_TYPE_ENUM_SWAP( pType ){ \
+		*((tOCT_UINT32 *)pType) = mOCT_SWAP32_IF_LE( *((tOCT_UINT32 *)pType) ); }
+#else
+
+#define mOCTDEV_DEVICES_DSP_CORE_TYPE_ENUM_SWAP( pType )
+
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+#ifdef __cplusplus
+}
+
+#endif
+
+#endif /* __OCTDEV_DEVICES_SWAP_H__ */

software/include/octdev_macro.h

@@ -2,13 +2,25 @@
 
 File: OCTDEV_MACRO.h
 
-Copyright (c) 2014 Octasic Inc. All rights reserved.
+Copyright (c) 2015 Octasic Inc. All rights reserved.
 
 Description: 
 
-This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.

You should have received a copy of the GNU Affero General Public License
along with this program.  If not, see <http://www.gnu.org/licenses/>.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-Octasic_Release: OCTSDR-2G-01.08.05-B29-ALPHA (2014/08/14)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27)
 
 $Revision: $
 

software/include/octdev_opus_rev.h

@@ -2,13 +2,25 @@
 
 File: OCTDEV_OPUS_REV.h
 
-Copyright (c) 2014 Octasic Inc. All rights reserved.
+Copyright (c) 2015 Octasic Inc. All rights reserved.
 
 Description: 
 
-This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.

You should have received a copy of the GNU Affero General Public License
along with this program.  If not, see <http://www.gnu.org/licenses/>.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-Octasic_Release: OCTSDR-2G-01.08.05-B29-ALPHA (2014/08/14)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27)
 
 $Revision: $
 

software/include/octdev_rc_base.h

@@ -2,13 +2,25 @@
 
 File: OCTDEV_RC_BASE.h
 
-Copyright (c) 2014 Octasic Inc. All rights reserved.
+Copyright (c) 2015 Octasic Inc. All rights reserved.
 
 Description: 
 
-This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.

You should have received a copy of the GNU Affero General Public License
along with this program.  If not, see <http://www.gnu.org/licenses/>.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-Octasic_Release: OCTSDR-2G-01.08.05-B29-ALPHA (2014/08/14)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27)
 
 $Revision: $
 

software/include/octdev_types.h

@@ -2,13 +2,25 @@
 
 File: OCTDEV_TYPES.h
 
-Copyright (c) 2014 Octasic Inc. All rights reserved.
+Copyright (c) 2015 Octasic Inc. All rights reserved.
 
 Description: 
 
-This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.

You should have received a copy of the GNU Affero General Public License
along with this program.  If not, see <http://www.gnu.org/licenses/>.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-Octasic_Release: OCTSDR-2G-01.08.05-B29-ALPHA (2014/08/14)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27)
 
 $Revision: $
 
@@ -63,6 +75,9 @@ $Revision: $
 	#error Cannot determine 32-bit type
 #endif
 
+typedef long long			tOCT_INT64;
+typedef unsigned long long	tOCT_UINT64;
+
 typedef char			tOCT_INT8;
 typedef unsigned char	tOCT_UINT8;
             
@@ -102,30 +117,40 @@ typedef unsigned char	tOCT_UINT8;
 	/* Look for Intel target */
 	#if defined( __OCT_ENV_OPUS__ ) || defined( _M_OPUS1 ) || defined( _M_OPUS2 ) || defined( _M_OPUS3 )
 		#define _OCT_ENDIAN_TYPE_BE_
+		#define _OCT_PLATFORM_OPUS_
 	#elif defined( _M_IX86 ) || defined(__x86_64__)
 		#define _OCT_ENDIAN_TYPE_LE_
+		#define _OCT_PLATFORM_X86_
 	#elif defined( __i386 )
 		#define _OCT_ENDIAN_TYPE_LE_
+		#define _OCT_PLATFORM_X86_
 	#elif defined( i386 )
 		#define _OCT_ENDIAN_TYPE_LE_
+		#define _OCT_PLATFORM_X86_
 	/* Look for Motorola PPC target */
 	#elif defined( _M_MPPC  ) || defined( _M_PPC ) || defined( __ppc__ ) || defined( __PPC )
 		#define _OCT_ENDIAN_TYPE_BE_
+		#define _OCT_PLATFORM_PPC_
 	/* Look for Sparc target */
 	#elif defined( __sparc )
 		#define _OCT_ENDIAN_TYPE_BE_
+		#define _OCT_PLATFORM_SPARC_
 	#elif defined( __sun__ )
 		#define _OCT_ENDIAN_TYPE_BE_
+		#define _OCT_PLATFORM_SPARC_
 	/* Look for ARM target */
 	#elif defined( __ARMEL__ )
 		#define _OCT_ENDIAN_TYPE_LE_
+		#define _OCT_PLATFORM_ARM_
 	/* Look for MIPS target */
 	#elif  defined( __mips__ ) || defined( __MIPSEB )
 		#define _OCT_ENDIAN_TYPE_BE_
+		#define _OCT_PLATFORM_MIPS_
 	/* others */
 	#elif defined( CPU )
 		#if CPU==PPC860
 			#define _OCT_ENDIAN_TYPE_BE_
+			#define _OCT_PLATFORM_PPC_
 		#endif
 	#endif
 #endif
@@ -153,16 +178,19 @@ typedef unsigned char	tOCT_UINT8;
 
 #if defined( __OCT_ENV_OPUS__ ) || defined( _M_OPUS1 ) || defined( _M_OPUS2 ) || defined( _M_OPUS3 )
 	#define OCT_ENV_TYPE_OPUS
+	#define OCT_ENV_TYPE_OCTSYS
 #ifdef _DEBUG
 	#define OCT_ENV_MODE_DEBUG
 #endif   
 #elif defined( _LINUX_ ) || defined( __linux__ )
 	#define OCT_ENV_TYPE_LINUX
+  #define OCT_ENV_TYPE_OCTOS
 #ifndef NDEBUG
 	#define OCT_ENV_MODE_DEBUG
 #endif   
-#elif defined( _WIN32 ) || defined( _WIN64 ) || defined( WIN32 ) || defined( WIN64 )
+#elif defined( _WIN32 ) || defined( WIN32 ) || defined( __WIN32__ ) ||	defined( _WIN32_ ) || defined( WIN32S ) || defined( _WIN64 )  || defined( WIN64 )
 	#define OCT_ENV_TYPE_WINDOWS
+  #define OCT_ENV_TYPE_OCTOS
 #ifdef _DEBUG
 	#define OCT_ENV_MODE_DEBUG
 #endif   
@@ -171,6 +199,33 @@ typedef unsigned char	tOCT_UINT8;
   #pragma message(__OCTDEV_TYPE_WARNLOC__"Environment platform not determined")
 #endif
 
+/*--------------------------------------------------------------------------
+	POINTER type definition
+----------------------------------------------------------------------------*/
+#if defined( OCT_ENV_TYPE_WINDOWS )
+#include <basetsd.h>
+
+#define tOCT_UINT_PTR	UINT_PTR
+#define tOCT_INT_PTR	INT_PTR
+
+#elif defined( OCT_ENV_TYPE_LINUX )
+#include <inttypes.h>
+
+#define tOCT_UINT_PTR	uintptr_t
+#define tOCT_INT_PTR	intptr_t
+
+#elif defined( OCT_ENV_TYPE_OCTSYS )
+#include  <stdint.h>
+
+#define tOCT_UINT_PTR	uintptr_t
+#define tOCT_INT_PTR	intptr_t
+
+#else 
+	#pragma message(__OCTDEV_TYPE_WARNLOC__"Environment pointer determined")
+
+
+#endif /* OCT_ENV_TYPE_WINDOWS */
+
               
 /*-------------------------------------------------------------------------------------
  	Generic IP Address

software/include/octdev_types_swap.h

@@ -2,13 +2,25 @@
 
 File: octdev_types_swap.h	
 
-Copyright (c) 2014 Octasic Inc. All rights reserved.	
+Copyright (c) 2015 Octasic Inc. All rights reserved.	
 
 Description:	
 
-This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.

You should have received a copy of the GNU Affero General Public License
along with this program.  If not, see <http://www.gnu.org/licenses/>.	
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
 
-Octasic_Release: OCTSDR-2G-01.08.05-B29-ALPHA (2014/08/14)	
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.	
+
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27)	
 
 \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/	
 #ifndef __OCTDEV_TYPES_SWAP_H__
@@ -19,16 +31,24 @@ extern "C" {
 #endif
 
 /*****************************  INCLUDE FILES  *******************************/
-#include "vocallo/octvc1_swap_hdrs.h"
+#include "octvc1/octvc1_swap_hdrs.h"
 #include "octdev_types.h"
 
 /*********************************  MACROS  **********************************/
 
 
 #if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTDEV_IP_ADDRESS_SWAP( _f_pParms ){ 	tOCTDEV_IP_ADDRESS * pOCTDEV_IP_ADDRESS = (_f_pParms); \
+#define mOCTDEV_IP_VERSION_ENUM_SWAP( pType ){ \
-	((tOCTDEV_IP_ADDRESS *)pOCTDEV_IP_ADDRESS)->ulIpVersion = \
+		*((tOCT_UINT32 *)pType) = mOCT_SWAP32_IF_LE( *((tOCT_UINT32 *)pType) ); }
-		mOCT_SWAP32_IF_LE(((tOCTDEV_IP_ADDRESS *)pOCTDEV_IP_ADDRESS)->ulIpVersion); \
+#else
+
+#define mOCTDEV_IP_VERSION_ENUM_SWAP( pType )
+
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTDEV_IP_ADDRESS_SWAP( _f_pParms ){ 	tOCTDEV_IP_ADDRESS * pOCTDEV_IP_ADDRESS = (_f_pParms); SWAP_UNUSED(pOCTDEV_IP_ADDRESS)\
+	{ mOCTDEV_IP_VERSION_ENUM_SWAP( &((tOCTDEV_IP_ADDRESS *)pOCTDEV_IP_ADDRESS)->ulIpVersion ); }  \
 	{ tOCT_UINT32 iOCTDEV_IP_ADDRESS; \
 	for( iOCTDEV_IP_ADDRESS=0; \
 		iOCTDEV_IP_ADDRESS<(4);iOCTDEV_IP_ADDRESS++ ) \
@@ -40,7 +60,7 @@ extern "C" {
 #endif /* _OCT_ENDIAN_TYPE_LE_ */
 
 #if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTDEV_UDP_ADDRESS_SWAP( _f_pParms ){ 	tOCTDEV_UDP_ADDRESS * pOCTDEV_UDP_ADDRESS = (_f_pParms); \
+#define mOCTDEV_UDP_ADDRESS_SWAP( _f_pParms ){ 	tOCTDEV_UDP_ADDRESS * pOCTDEV_UDP_ADDRESS = (_f_pParms); SWAP_UNUSED(pOCTDEV_UDP_ADDRESS)\
 	{ mOCTDEV_IP_ADDRESS_SWAP( &((tOCTDEV_UDP_ADDRESS *)pOCTDEV_UDP_ADDRESS)->IpAddress ); }  \
 	((tOCTDEV_UDP_ADDRESS *)pOCTDEV_UDP_ADDRESS)->ulUdpPort = \
 		mOCT_SWAP32_IF_LE(((tOCTDEV_UDP_ADDRESS *)pOCTDEV_UDP_ADDRESS)->ulUdpPort); \
@@ -50,7 +70,7 @@ extern "C" {
 #endif /* _OCT_ENDIAN_TYPE_LE_ */
 
 #if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTDEV_TCP_ADDRESS_SWAP( _f_pParms ){ 	tOCTDEV_TCP_ADDRESS * pOCTDEV_TCP_ADDRESS = (_f_pParms); \
+#define mOCTDEV_TCP_ADDRESS_SWAP( _f_pParms ){ 	tOCTDEV_TCP_ADDRESS * pOCTDEV_TCP_ADDRESS = (_f_pParms); SWAP_UNUSED(pOCTDEV_TCP_ADDRESS)\
 	{ mOCTDEV_IP_ADDRESS_SWAP( &((tOCTDEV_TCP_ADDRESS *)pOCTDEV_TCP_ADDRESS)->IpAddress ); }  \
 	((tOCTDEV_TCP_ADDRESS *)pOCTDEV_TCP_ADDRESS)->ulTcpPort = \
 		mOCT_SWAP32_IF_LE(((tOCTDEV_TCP_ADDRESS *)pOCTDEV_TCP_ADDRESS)->ulTcpPort); \

software/include/octpkt/octpkt_hdr.h

@@ -2,13 +2,25 @@
 
 File: OCTPKT_HDR.h
 
-Copyright (c) 2014 Octasic Inc. All rights reserved.
+Copyright (c) 2015 Octasic Inc. All rights reserved.
 
 Description: 
 
-This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.

You should have received a copy of the GNU Affero General Public License
along with this program.  If not, see <http://www.gnu.org/licenses/>.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-Octasic_Release: OCTSDR-2G-01.08.05-B29-ALPHA (2014/08/14)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27)
 
 $Revision: $
 
@@ -25,8 +37,6 @@ $Revision: $
 /************************  COMMON DEFINITIONS  *******************************/
 
 #define cOCTPKT_HDR_ETHERTYPE								0x5200	
-#define cOCTPKT_HDR_WCDMA									0xCDAB	
-#define cOCTPKT_HDR_GSM										0xF00D	
 
 /*-------------------------------------------------------------------------------------
  	OctPkt-Packet Format Values
@@ -62,7 +72,6 @@ $Revision: $
 #define cOCTPKT_HDR_CONTROL_PROTOCOL_TYPE_ENUM_OCTVOCNET	0x0		 	/* Vocallo MGW Control Protocol */
 #define cOCTPKT_HDR_CONTROL_PROTOCOL_TYPE_ENUM_OCTMFA		0x1		 	/* Media Flow Aggregator Control Protocol */
 #define cOCTPKT_HDR_CONTROL_PROTOCOL_TYPE_ENUM_LTE_FAPI		0x2		 	/* SDR LTE femtocells API Protocol */
-#define cOCTPKT_HDR_CONTROL_PROTOCOL_TYPE_ENUM_OCTSDR		3		 	/* Sdr packets */
 #define cOCTPKT_HDR_CONTROL_PROTOCOL_TYPE_ENUM_TEST			0xE		 	/* TEST Protocol */
 #define cOCTPKT_HDR_CONTROL_PROTOCOL_TYPE_ENUM_NONE			0xFFFFFFFF	 	/* Not used */
 

software/include/octpkt/octpkt_hdr_swap.h

@@ -2,13 +2,25 @@
 
 File: octpkt_hdr_swap.h	
 
-Copyright (c) 2014 Octasic Inc. All rights reserved.	
+Copyright (c) 2015 Octasic Inc. All rights reserved.	
 
 Description:	
 
-This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.

You should have received a copy of the GNU Affero General Public License
along with this program.  If not, see <http://www.gnu.org/licenses/>.	
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
 
-Octasic_Release: OCTSDR-2G-01.08.05-B29-ALPHA (2014/08/14)	
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.	
+
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27)	
 
 \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/	
 #ifndef __OCTPKT_HDR_SWAP_H__
@@ -19,16 +31,33 @@ extern "C" {
 #endif
 
 /*****************************  INCLUDE FILES  *******************************/
-#include "../vocallo/octvc1_swap_hdrs.h"
+#include "../octvc1/octvc1_swap_hdrs.h"
 #include "octpkt_hdr.h"
 
 /*********************************  MACROS  **********************************/
 
 
 #if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTPKT_HDR_SWAP( _f_pParms ){ 	tOCTPKT_HDR * pOCTPKT_HDR = (_f_pParms); \
+#define mOCTPKT_HDR_FORMAT_PROTO_TYPE_LEN_MASK_SWAP( pType ){ \
-	((tOCTPKT_HDR *)pOCTPKT_HDR)->ul_Format_Trace_Length = \
+		*((tOCT_UINT32 *)pType) = mOCT_SWAP32_IF_LE( *((tOCT_UINT32 *)pType) ); }
-		mOCT_SWAP32_IF_LE(((tOCTPKT_HDR *)pOCTPKT_HDR)->ul_Format_Trace_Length); \
+#else
+
+#define mOCTPKT_HDR_FORMAT_PROTO_TYPE_LEN_MASK_SWAP( pType )
+
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTPKT_HDR_CONTROL_PROTOCOL_TYPE_ENUM_SWAP( pType ){ \
+		*((tOCT_UINT32 *)pType) = mOCT_SWAP32_IF_LE( *((tOCT_UINT32 *)pType) ); }
+#else
+
+#define mOCTPKT_HDR_CONTROL_PROTOCOL_TYPE_ENUM_SWAP( pType )
+
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTPKT_HDR_SWAP( _f_pParms ){ 	tOCTPKT_HDR * pOCTPKT_HDR = (_f_pParms); SWAP_UNUSED(pOCTPKT_HDR)\
+	{ mOCTPKT_HDR_FORMAT_PROTO_TYPE_LEN_MASK_SWAP( &((tOCTPKT_HDR *)pOCTPKT_HDR)->ul_Format_Trace_Length ); }  \
 }
 #else
 #define mOCTPKT_HDR_SWAP( pOCTPKT_HDR )

software/include/octpkt/octpkt_hdrxl.h

@@ -2,13 +2,25 @@
 
 File: OCTPKT_HDRXL.h
 
-Copyright (c) 2014 Octasic Inc. All rights reserved.
+Copyright (c) 2015 Octasic Inc. All rights reserved.
 
 Description: 
 
-This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.

You should have received a copy of the GNU Affero General Public License
along with this program.  If not, see <http://www.gnu.org/licenses/>.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-Octasic_Release: OCTSDR-2G-01.08.05-B29-ALPHA (2014/08/14)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27)
 
 $Revision: $
 

software/include/octpkt/octpkt_hdrxl_swap.h

@@ -2,13 +2,25 @@
 
 File: octpkt_hdrxl_swap.h	
 
-Copyright (c) 2014 Octasic Inc. All rights reserved.	
+Copyright (c) 2015 Octasic Inc. All rights reserved.	
 
 Description:	
 
-This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.

You should have received a copy of the GNU Affero General Public License
along with this program.  If not, see <http://www.gnu.org/licenses/>.	
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
 
-Octasic_Release: OCTSDR-2G-01.08.05-B29-ALPHA (2014/08/14)	
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.	
+
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27)	
 
 \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/	
 #ifndef __OCTPKT_HDRXL_SWAP_H__
@@ -19,23 +31,31 @@ extern "C" {
 #endif
 
 /*****************************  INCLUDE FILES  *******************************/
-#include "../vocallo/octvc1_swap_hdrs.h"
+#include "../octvc1/octvc1_swap_hdrs.h"
 #include "octpkt_hdrxl.h"
 
 /*********************************  MACROS  **********************************/
 
 
 #if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTPKT_HDRXL_SWAP( _f_pParms ){ 	tOCTPKT_HDRXL * pOCTPKT_HDRXL = (_f_pParms); \
+#define mOCTPKT_HDRXL_FORMAT_PROTO_TYPE_LEN_MASK_SWAP( pType ){ \
-	((tOCTPKT_HDRXL *)pOCTPKT_HDRXL)->ul_Proto_Format_Length = \
+		*((tOCT_UINT32 *)pType) = mOCT_SWAP32_IF_LE( *((tOCT_UINT32 *)pType) ); }
-		mOCT_SWAP32_IF_LE(((tOCTPKT_HDRXL *)pOCTPKT_HDRXL)->ul_Proto_Format_Length); \
+#else
+
+#define mOCTPKT_HDRXL_FORMAT_PROTO_TYPE_LEN_MASK_SWAP( pType )
+
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTPKT_HDRXL_SWAP( _f_pParms ){ 	tOCTPKT_HDRXL * pOCTPKT_HDRXL = (_f_pParms); SWAP_UNUSED(pOCTPKT_HDRXL)\
+	{ mOCTPKT_HDRXL_FORMAT_PROTO_TYPE_LEN_MASK_SWAP( &((tOCTPKT_HDRXL *)pOCTPKT_HDRXL)->ul_Proto_Format_Length ); }  \
 }
 #else
 #define mOCTPKT_HDRXL_SWAP( pOCTPKT_HDRXL )
 #endif /* _OCT_ENDIAN_TYPE_LE_ */
 
 #if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTPKT_HDRXL_ETH_SWAP( _f_pParms ){ 	tOCTPKT_HDRXL_ETH * pOCTPKT_HDRXL_ETH = (_f_pParms); \
+#define mOCTPKT_HDRXL_ETH_SWAP( _f_pParms ){ 	tOCTPKT_HDRXL_ETH * pOCTPKT_HDRXL_ETH = (_f_pParms); SWAP_UNUSED(pOCTPKT_HDRXL_ETH)\
 	((tOCTPKT_HDRXL_ETH *)pOCTPKT_HDRXL_ETH)->usReserved = \
 		mOCT_SWAP16_IF_LE(((tOCTPKT_HDRXL_ETH *)pOCTPKT_HDRXL_ETH)->usReserved);  \
 }