Re: [Wireshark-dev] Wireshark code review
On Wed, Mar 25, 2015 at 7:10 AM, Anil anilkumar...@gmail.com wrote: Hi All -- I have done a mistake with submitting code for review. My initial review is https://code.wireshark.org/review/#/c/7751 https://code.wireshark.org/review/#/c/7751/1/epan/dissectors/packet-nstrace.c I fixed the issues reported there and have checked in the new changes. The problem is that the new changes are in a different branch than the original one. So it has created a new review https://code.wireshark.org/review/#/c/7802/ I need some help about what can be done now ? Hi Anil, You need to squash your 2 commit in one commit with the same changeId like review 7751 You can use git rebase -i origin and for second commit replace pick by squash (or fixup) and for future update, you only need to use git commit -a --amend More information available here http://wiki.wireshark.org/Development/SubmittingPatches --Anil ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:https://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-requ...@wireshark.org ?subject=unsubscribe ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:https://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe
[Wireshark-dev] Wireshark code review
Hi All -- I have done a mistake with submitting code for review. My initial review is https://code.wireshark.org/review/#/c/7751 https://code.wireshark.org/review/#/c/7751/1/epan/dissectors/packet-nstrace.c I fixed the issues reported there and have checked in the new changes. The problem is that the new changes are in a different branch than the original one. So it has created a new review https://code.wireshark.org/review/#/c/7802/ I need some help about what can be done now ? --Anil ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:https://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe
Re: [Wireshark-dev] Wireshark code review
Since you now have 2 changes submitted, you should abandon one of them (do it from the web interface), then follow Alexis' suggestion about sqashing and amending, then push the final revision into the survived change (do it using the correct change-id, read it from the web interface again). I don't know what happens if one push a change-x from a branch b1, then push the same change-x from another branch b2. Maybe the latter overwrites the first in gerrit? Anyone tried it? On Wed, Mar 25, 2015 at 7:10 AM, Anil anilkumar...@gmail.com wrote: Hi All -- I have done a mistake with submitting code for review. My initial review is https://code.wireshark.org/review/#/c/7751 https://code.wireshark.org/review/#/c/7751/1/epan/dissectors/packet-nstrace.c I fixed the issues reported there and have checked in the new changes. The problem is that the new changes are in a different branch than the original one. So it has created a new review https://code.wireshark.org/review/#/c/7802/ I need some help about what can be done now ? --Anil ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:https://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-requ...@wireshark.org ?subject=unsubscribe ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:https://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe
Re: [Wireshark-dev] Wireshark code review
On Wed, Mar 25, 2015 at 09:15:52AM +0100, Dario Lombardo wrote: Since you now have 2 changes submitted, you should abandon one of them (do it from the web interface), then follow Alexis' suggestion about sqashing and amending, then push the final revision into the survived change (do it using the correct change-id, read it from the web interface again). I don't know what happens if one push a change-x from a branch b1, then push the same change-x from another branch b2. Maybe the latter overwrites the first in gerrit? Anyone tried it? It is a valid use to have the same change-id in different branches. It makes it possible to easily find backports that way, for example. If a change was posted to the wrong upstream branch in Gerrit, you will need to abandon that change and post it to the correct branch. Posting a patch with a change-id that is already in a different branch, will not overwrite/abandon the already existing patch. HTH, Niels On Wed, Mar 25, 2015 at 7:10 AM, Anil anilkumar...@gmail.com wrote: Hi All -- I have done a mistake with submitting code for review. My initial review is https://code.wireshark.org/review/#/c/7751 https://code.wireshark.org/review/#/c/7751/1/epan/dissectors/packet-nstrace.c I fixed the issues reported there and have checked in the new changes. The problem is that the new changes are in a different branch than the original one. So it has created a new review https://code.wireshark.org/review/#/c/7802/ I need some help about what can be done now ? --Anil ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:https://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-requ...@wireshark.org ?subject=unsubscribe ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:https://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:https://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe
Re: [Wireshark-dev] Wireshark code review
On Wed, Mar 25, 2015 at 9:15 AM, Dario Lombardo dario.lombardo...@gmail.com wrote: Since you now have 2 changes submitted, you should abandon one of them (do it from the web interface), then follow Alexis' suggestion about sqashing and amending, then push the final revision into the survived change (do it using the correct change-id, read it from the web interface again). I don't know what happens if one push a change-x from a branch b1, then push the same change-x from another branch b2. Maybe the latter overwrites the first in gerrit? Anyone tried it? From local branch ? or remote branch ? (master / master-1.12...) On Wed, Mar 25, 2015 at 7:10 AM, Anil anilkumar...@gmail.com wrote: Hi All -- I have done a mistake with submitting code for review. My initial review is https://code.wireshark.org/review/#/c/7751 https://code.wireshark.org/review/#/c/7751/1/epan/dissectors/packet-nstrace.c I fixed the issues reported there and have checked in the new changes. The problem is that the new changes are in a different branch than the original one. So it has created a new review https://code.wireshark.org/review/#/c/7802/ I need some help about what can be done now ? --Anil ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:https://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-requ...@wireshark.org ?subject=unsubscribe ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:https://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-requ...@wireshark.org ?subject=unsubscribe ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:https://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe
[Wireshark-dev] CMake on Windows - Can build, but not run executable
Hi I can build wireshark successfully (gtk and qt interfaces) on Windows, but If I want to execute it, he complains that the side-by-side configuration is not correct. If I trace the launch with sxstrace, he complains, that the ProcessorArchitecture is wrong for the target (amd64). The build is a Windows 64bit build kind regards, Roland ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:https://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe
Re: [Wireshark-dev] Wireshark code review
On Wed, Mar 25, 2015 at 10:03 AM, Alexis La Goutte alexis.lagou...@gmail.com wrote: From local branch ? or remote branch ? (master / master-1.12...) From local. ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:https://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe
[Wireshark-dev] dpkg-buildpackage -rfakeroot picking wrong version and dissectors
Hi all, I am building a package for Ubuntu, and the debian packages I get as result are not picking the proper customized version (set in configure.ac), but what is worse, a custom dissector I wrote is not in the packages. I did make before doing the packaging and ./wireshark-gtk is as I expect. Do I have to configure anything else before doing dpkg-buildpackage -rfakeroot? By the way, the rest of the build system works sweet in Centos, Mac and Windows. Thanks, Juanjo ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:https://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe
Re: [Wireshark-dev] dpkg-buildpackage -rfakeroot picking wrong version and dissectors
Hi Juanjo, 2015-03-25 15:26 GMT+01:00 Juan Jose Martin Carrascosa jua...@rti.com: Hi all, I am building a package for Ubuntu, and the debian packages I get as result are not picking the proper customized version (set in configure.ac), but what is worse, a custom dissector I wrote is not in the packages. The Debian packages use the cmake-based build system thus you have your custimizations present there to be part of the packages. Cheers, Balint I did make before doing the packaging and ./wireshark-gtk is as I expect. Do I have to configure anything else before doing dpkg-buildpackage -rfakeroot? By the way, the rest of the build system works sweet in Centos, Mac and Windows. Thanks, Juanjo ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:https://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:https://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe
Re: [Wireshark-dev] dpkg-buildpackage -rfakeroot picking wrong version and dissectors
Thanks for the prompt reply Bálint. So, I assume that what I did for the make build doesn't apply here. Does anyone know how to modify the cmake build for: 1) add a dissector 2) add files to the package (for instance, a pdf in the root directory) 3) change the version Any documentation/guidelines would be appreciated. Thanks, Juanjo On Wed, Mar 25, 2015 at 3:36 PM, Bálint Réczey bal...@balintreczey.hu wrote: Hi Juanjo, 2015-03-25 15:26 GMT+01:00 Juan Jose Martin Carrascosa jua...@rti.com: Hi all, I am building a package for Ubuntu, and the debian packages I get as result are not picking the proper customized version (set in configure.ac), but what is worse, a custom dissector I wrote is not in the packages. The Debian packages use the cmake-based build system thus you have your custimizations present there to be part of the packages. Cheers, Balint I did make before doing the packaging and ./wireshark-gtk is as I expect. Do I have to configure anything else before doing dpkg-buildpackage -rfakeroot? By the way, the rest of the build system works sweet in Centos, Mac and Windows. Thanks, Juanjo ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:https://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-requ...@wireshark.org ?subject=unsubscribe ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:https://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-requ...@wireshark.org ?subject=unsubscribe ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:https://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe
Re: [Wireshark-dev] dpkg-buildpackage -rfakeroot picking wrong version and dissectors
Well, after doing some awful research... 1) To add the dissector, I edited epan/CMakeLists.txt. 2) To add files to the package, I added my custom files to the same list that colorfilters is, and it seems it work. 3) It seems the version is controlled in CMakeLists.txt using PROJECT_MAJOR/MINOR/PATCH_VERSION and PROJECT_VERSION_EXTENSION. I think I got it working. Thanks for the initial point Bálint. Juanjo On Wed, Mar 25, 2015 at 4:06 PM, Juan Jose Martin Carrascosa jua...@rti.com wrote: Thanks for the prompt reply Bálint. So, I assume that what I did for the make build doesn't apply here. Does anyone know how to modify the cmake build for: 1) add a dissector 2) add files to the package (for instance, a pdf in the root directory) 3) change the version Any documentation/guidelines would be appreciated. Thanks, Juanjo On Wed, Mar 25, 2015 at 3:36 PM, Bálint Réczey bal...@balintreczey.hu wrote: Hi Juanjo, 2015-03-25 15:26 GMT+01:00 Juan Jose Martin Carrascosa jua...@rti.com: Hi all, I am building a package for Ubuntu, and the debian packages I get as result are not picking the proper customized version (set in configure.ac), but what is worse, a custom dissector I wrote is not in the packages. The Debian packages use the cmake-based build system thus you have your custimizations present there to be part of the packages. Cheers, Balint I did make before doing the packaging and ./wireshark-gtk is as I expect. Do I have to configure anything else before doing dpkg-buildpackage -rfakeroot? By the way, the rest of the build system works sweet in Centos, Mac and Windows. Thanks, Juanjo ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:https://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-requ...@wireshark.org ?subject=unsubscribe ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:https://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-requ...@wireshark.org ?subject=unsubscribe ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:https://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe
Re: [Wireshark-dev] dpkg-buildpackage -rfakeroot picking wrong version and dissectors
Hi, You could also add it to a CMakeListCustom.txt file see CMakelistCustom.txt.example you also need a Cmake file in your custom dissectors file. Regards Anders From: wireshark-dev-boun...@wireshark.org [mailto:wireshark-dev-boun...@wireshark.org] On Behalf Of Juan Jose Martin Carrascosa Sent: den 25 mars 2015 17:10 To: Bálint Réczey; Developer support list for Wireshark Subject: Re: [Wireshark-dev] dpkg-buildpackage -rfakeroot picking wrong version and dissectors Well, after doing some awful research... 1) To add the dissector, I edited epan/CMakeLists.txt. 2) To add files to the package, I added my custom files to the same list that colorfilters is, and it seems it work. 3) It seems the version is controlled in CMakeLists.txt using PROJECT_MAJOR/MINOR/PATCH_VERSION and PROJECT_VERSION_EXTENSION. I think I got it working. Thanks for the initial point Bálint. Juanjo On Wed, Mar 25, 2015 at 4:06 PM, Juan Jose Martin Carrascosa jua...@rti.commailto:jua...@rti.com wrote: Thanks for the prompt reply Bálint. So, I assume that what I did for the make build doesn't apply here. Does anyone know how to modify the cmake build for: 1) add a dissector 2) add files to the package (for instance, a pdf in the root directory) 3) change the version Any documentation/guidelines would be appreciated. Thanks, Juanjo On Wed, Mar 25, 2015 at 3:36 PM, Bálint Réczey bal...@balintreczey.humailto:bal...@balintreczey.hu wrote: Hi Juanjo, 2015-03-25 15:26 GMT+01:00 Juan Jose Martin Carrascosa jua...@rti.commailto:jua...@rti.com: Hi all, I am building a package for Ubuntu, and the debian packages I get as result are not picking the proper customized version (set in configure.achttp://configure.ac), but what is worse, a custom dissector I wrote is not in the packages. The Debian packages use the cmake-based build system thus you have your custimizations present there to be part of the packages. Cheers, Balint I did make before doing the packaging and ./wireshark-gtk is as I expect. Do I have to configure anything else before doing dpkg-buildpackage -rfakeroot? By the way, the rest of the build system works sweet in Centos, Mac and Windows. Thanks, Juanjo ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.orgmailto:wireshark-dev@wireshark.org Archives:https://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-requ...@wireshark.orgmailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.orgmailto:wireshark-dev@wireshark.org Archives:https://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-requ...@wireshark.orgmailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:https://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe
Re: [Wireshark-dev] CMake on Windows - Can build, but not run executable
On 25 March 2015 at 08:17, Roland Knall rkn...@gmail.com wrote: Hi I can build wireshark successfully (gtk and qt interfaces) on Windows, but If I want to execute it, he complains that the side-by-side configuration is not correct. If I trace the launch with sxstrace, he complains, that the ProcessorArchitecture is wrong for the target (amd64). The build is a Windows 64bit build Using VS2013, CMake 3.1.3, QT 5.4.1 msvc2013_64_opengl. I don't normally build x64, so gave it a go using the x64 native compiler and CMake fails configure, the testing for various sizes fails as CMake is asking the linker to use both x64 and x86 modes?? If I use the cross compiler (i.e. x86 building x64) then CMake does configure and the resulting build runs for me (both qt and gtk). I usually run depends (http://www.dependencywalker.com/) to check what DLL's etc are to be loaded. -- Graham Bloice ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:https://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe
Re: [Wireshark-dev] Supported Python versions?
On Sun, Mar 22, 2015 at 04:48:38PM +0100, Peter Wu wrote: | Triggered by a build error due to html2text.py, I have recently started | with adding Python 3 support to various Python scripts[1][2]. The change | to html2text.py[1] was tested with Python 2.6, 2.7, 3.2 and 3.4. | | The configure script however checks for Python = 2.5 which was first | released in 2006 with the last security update in 2011. This version | also lacks support for nice language constructs such as 'with'. | checklicenses.py is already incompatible with this. | | Any objections if this gets bumped to 2.6 or even 2.7? The | dfilter-test.py script already requires 2.7 (or newer). RHEL 6 (and CentOS 6) ship with python 2.6. python 2.6 has handy language features such as 'with'. I don't know if python 2.7 provides new language features that are strictly necessary. I know there are some new modules in 2.7 that some people prefer (e.g. OrderedDict, unittest, argparse), but IMHO they can be worked around by using the older version :) (RHEL 5 has python 2.4, which as you mention, is already complained about as being too old.) regards, Luke. pgprAcAyp7dFR.pgp Description: PGP signature ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:https://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe
