Wireshark · Wireshark-dev: Re: [Wireshark-dev] Submitting a patch

[Gerhard Gappmeier <gerhard.gappmeier@xxxxxxxxxxx>]

Hi Ulf,

I did some minor changes today to accomplish your coding guidelines.
I attached the new protocol dissector as follows:
1.) The patch for the makefile changes
2.) The new sources are in the attached zip file. (renamed to zip_ to avoid mail filtering)
3.) A sample capture file to test the dissector.

Please take a look at sources if they are ok and add them to the repository.
You can also reach me via skype as "gergap" if you want to discuss some changes.

regards,
Gerhard.

Ulf Lamping schrieb:

Gerhard Gappmeier wrote:
  

I'm using tortoise SVN, right clicking on the folder "plugins" and using
"Create Patch".
The resulting patch file contains every file in the subfolder "opcua" twice.
Does anyone know this problem und how to solve that?
  
    

No, not really.

It *may* help to create a patch from the toplevel source dir and strip 
down unnecessary parts if necessary.
  

I could also zip the sources and send you that instead.
  
    

You may try at least to create a patch for the makefiles in the plugins 
dir and in addition a zip of your plugin\opcua folder.

Please read the coding guidelines in doc\README.developer *before* 
submitting your code! THIS IS IMPORTANT!!!
  

The next question is: After you have verified and integrated the code,
can I get access to the subfolder "plugins/opcua", so that I can check
in the following changes directly?
  
    

No. You can only get write access for the full repository, but you would 
need to submit "good code"(tm) on a frequent basis (not only 
occasionally) to gain that access.
  

I attached the readme containing some background information of OpcUa
and the current status.
  
    

You may add a Wiki protocol page for opcua and link from 
http://wiki.wireshark.org/FieldbusProtocolFamily to it (I guess it best 
fits into the fieldbus family, or am I wrong here?).
  

The OPC Foundation offers a free Opc Ua stack implementation in ANSI C
for all members. 
    

"a free implementation for all members" - sic!

Regards, ULFL
_______________________________________________
Wireshark-dev mailing list
Wireshark-dev@xxxxxxxxxxxxx
http://www.wireshark.org/mailman/listinfo/wireshark-dev
  

Attachment: testdata.cap
Description: Binary data

Index: configure.in
===================================================================
--- configure.in	(revision 21226)
+++ configure.in	(working copy)
@@ -1415,6 +1415,7 @@
   plugins/lwres/Makefile
   plugins/mate/Makefile
   plugins/mgcp/Makefile
+  plugins/opcua/Makefile
   plugins/opsi/Makefile
   plugins/pcli/Makefile
   plugins/profinet/Makefile
Index: Makefile.am
===================================================================
--- Makefile.am	(revision 21226)
+++ Makefile.am	(working copy)
@@ -228,6 +228,7 @@
 	-dlopen plugins/lwres/lwres.la \
 	-dlopen plugins/mate/mate.la \
 	-dlopen plugins/mgcp/mgcp.la \
+	-dlopen plugins/opcua/opcua.la \
 	-dlopen plugins/opsi/opsi.la \
 	-dlopen plugins/pcli/pcli.la \
 	-dlopen plugins/profinet/profinet.la \
Index: Makefile.nmake
===================================================================
--- Makefile.nmake	(revision 21226)
+++ Makefile.nmake	(working copy)
@@ -866,6 +866,7 @@
 	xcopy ".\plugins\lwres\lwres.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d
 	xcopy ".\plugins\mate\mate.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d
 	xcopy ".\plugins\mgcp\mgcp.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d
+	xcopy ".\plugins\opcua\opcua.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d
 	xcopy ".\plugins\opsi\opsi.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d
 	xcopy ".\plugins\pcli\pcli.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d
 	xcopy ".\plugins\profinet\profinet.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d
Index: plugins/Makefile.am
===================================================================
--- plugins/Makefile.am	(revision 21226)
+++ plugins/Makefile.am	(working copy)
@@ -35,6 +35,7 @@
 	lwres \
 	mate \
 	mgcp \
+	opcua \
 	opsi \
 	pcli \
 	profinet \
Index: plugins/Makefile.nmake
===================================================================
--- plugins/Makefile.nmake	(revision 21226)
+++ plugins/Makefile.nmake	(working copy)
@@ -21,6 +21,7 @@
 	lwres \
 	mate \
 	mgcp \
+	opcua \
 	opsi \
 	pcli \
 	profinet \
@@ -99,6 +100,12 @@
 	cd mgcp
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
 	cd .. 
+
+opcua::
+	cd opcua
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
+	cd ..
+
 opsi::
 	cd opsi
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
@@ -185,6 +192,9 @@
 	cd mgcp
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
 	cd ..
+	cd opcua
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
+	cd ..
 	cd opsi
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
 	cd ..
@@ -254,6 +264,9 @@
 	cd mgcp
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
 	cd ..
+	cd opcua
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
+	cd ..
 	cd opsi
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
 	cd ..
@@ -323,6 +336,9 @@
 	cd mgcp
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
 	cd ..
+	cd opcua
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+	cd ..
 	cd opsi
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
 	cd ..
@@ -371,6 +387,7 @@
 	xcopy lwres\*.dll $(VERSION) /d
 	xcopy mate\*.dll $(VERSION) /d
 	xcopy mgcp\*.dll $(VERSION) /d
+	xcopy opcua\*.dll $(VERSION) /d
 	xcopy opsi\*.dll $(VERSION) /d
 	xcopy pcli\*.dll $(VERSION) /d
 	xcopy profinet\*.dll $(VERSION) /d

Attachment: opcua.zip_
Description: Binary data