[Wireshark-dev] Trunk Windows CMake builds are broken

2014-08-21 Thread Guy Harris
alert_box.c 55c:\buildbot\wireshark\wireshark-master-64\win7x64\build\config.h(256): warning C4005: 'VERSION' : macro redefinition (..\..\..\ui\gtk\capture_dlg.c) [C:\buildbot\wireshark\wireshark-master-64\win7x64\build\cmbuild\ui\gtk\gtkui.vcxproj]

Re: [Wireshark-dev] Machine on which wireshark capturing has been done

2014-08-21 Thread Guy Harris
On Aug 21, 2014, at 1:30 AM, Vishnu Bhatt vishnu.bh...@aricent.com wrote: Hello, I have a pcap file and I want to know on which machine is the file has been captured. Is there a way to know the Mac or IP address of the machine/switch on which the file has been taken? Not reliably; the

Re: [Wireshark-dev] Machine on which wireshark capturing has been done

2014-08-21 Thread Anders Broman
Hi, Not really, if it's a pcap-ng file look at statics-summary there is some info about Wireshark version and capture interface there I think. Which may help. Regards Anders From: wireshark-dev-boun...@wireshark.org [mailto:wireshark-dev-boun...@wireshark.org] On Behalf Of Vishnu Bhatt Sent:

Re: [Wireshark-dev] Trunk Windows CMake builds are broken

2014-08-21 Thread Graham Bloice
On 21 August 2014 09:13, Guy Harris g...@alum.mit.edu wrote: alert_box.c 55c:\buildbot\wireshark\wireshark-master-64\win7x64\build\config.h(256): warning C4005: 'VERSION' : macro redefinition (..\..\..\ui\gtk\capture_dlg.c)

Re: [Wireshark-dev] Trunk Windows CMake builds are broken

2014-08-21 Thread Guy Harris
On Aug 21, 2014, at 1:57 AM, Graham Bloice graham.blo...@trihedral.com wrote: This obviously worked before the merge of ExtCap, so that has disturbed things. The CMake build should be using the generated one in the CMake build directory, i.e.

Re: [Wireshark-dev] Trunk Windows CMake builds are broken

2014-08-21 Thread Graham Bloice
On 21 August 2014 10:04, Guy Harris g...@alum.mit.edu wrote: On Aug 21, 2014, at 1:57 AM, Graham Bloice graham.blo...@trihedral.com wrote: This obviously worked before the merge of ExtCap, so that has disturbed things. The CMake build should be using the generated one in the CMake build

Re: [Wireshark-dev] Trunk Windows CMake builds are broken

2014-08-21 Thread Shanks, Graham (UK)
On 21 August 2014 10:31, Graham Bloice graham.blo...@trihedral.com wrote: [snip] I've always had the idea that angle bracket form was for system or platform includes and quoted form for project includes, but maybe I was just confused. Strictly speaking, according to the standard, both forms

Re: [Wireshark-dev] Trunk Windows CMake builds are broken

2014-08-21 Thread Roland Knall
The #include config.h statement is a mistake, it should refer to #include config.h I've committed a change to https://code.wireshark.org/review/#/c/3763/ . It builds find on my Linux and Mac (using GLib 2.36). Also looking at the Mac buildbot (GLib 2.34 is the issue) right now, and maybe have

Re: [Wireshark-dev] Trunk Windows CMake builds are broken

2014-08-21 Thread Shanks, Graham (UK)
On 21 August 2014 11:19, Roland Knall rkn...@gmain.com wrote: The #include config.h statement is a mistake, it should refer to #include config.h Relying on the difference between the quoted and angle brackets form to select the correct config.h file is fragile. A better solution would be to

Re: [Wireshark-dev] Trunk Windows CMake builds are broken

2014-08-21 Thread Shanks, Graham (UK)
I meant “Any reason why this shouldn’t be done?” Regards, Graham BAE Systems Integrated System Technologies Limited Registered Office: Warwick House, PO Box 87, Farnborough Aerospace Centre, Farnborough, Hants, GU14 6YU, UK Registered in England Wales No: 3456325

Re: [Wireshark-dev] Trunk Windows CMake builds are broken

2014-08-21 Thread Graham Bloice
On 21 August 2014 11:32, Shanks, Graham (UK) graham.sha...@baesystems.com wrote: I meant “Any reason why this shouldn’t be done?” The fragility was the source of my unease about simply using the angle bracket form. Originally I thought moving config.h would lead to a lot of other

Re: [Wireshark-dev] Trunk Windows CMake builds are broken

2014-08-21 Thread Graham Bloice
On 21 August 2014 11:19, Roland Knall rkn...@gmail.com wrote: The #include config.h statement is a mistake, it should refer to #include config.h I've committed a change to https://code.wireshark.org/review/#/c/3763/ . It builds find on my Linux and Mac (using GLib 2.36). Also looking at

Re: [Wireshark-dev] Trunk Windows CMake builds are broken

2014-08-21 Thread Gisle Vanem
Shanks, Graham (UK) graham.sha...@baesystems.com wrote: A better solution would be to move the local config.h into a subdirectory and then use the following: #include “subdir/config.h” Since several dependent packages could have a config.h in it's ./include dir, (shadowing for Wireshark's

Re: [Wireshark-dev] Trunk Windows CMake builds are broken

2014-08-21 Thread Guy Harris
On Aug 21, 2014, at 4:20 AM, Gisle Vanem gva...@yahoo.no wrote: Shanks, Graham (UK) graham.sha...@baesystems.com wrote: A better solution would be to move the local config.h into a subdirectory and then use the following: #include “subdir/config.h” Since several dependent packages

Re: [Wireshark-dev] Trunk Windows CMake builds are broken

2014-08-21 Thread Gisle Vanem
Guy Harris g...@alum.mit.edu wrote: Presumably autotools can be convinced to generate ws_config.h rather than config.h. I'm not a user of auto* tools, but I guess it's done with: - AC_CONFIG_HEADERS(config.h) +AC_CONFIG_HEADERS(ws_config.h) --gv

[Wireshark-dev] Adding a new dissector - beginners guide

2014-08-21 Thread Thomas Wiens
Hi, I have written a dissector for a protocol which I call S7 communication. I've hosted it as plugin dll at sourceforge, but I think the better way is to contribute it direct into wireshark (if it's good enough). I've changed the dissector from plugin to internal and did the testtools, so I

Re: [Wireshark-dev] Adding a new dissector - beginners guide

2014-08-21 Thread Michal Orynicz
Hi, the best line of doing this would be going to https://code.wireshark.org/review/, registering there and then pushing Your change to https://code.wireshark.org/review/wireshark . This way the changes will go through review in gerrit, and no matter how bad or how good Your code is, it will stay

Re: [Wireshark-dev] Adding a new dissector - beginners guide

2014-08-21 Thread Michal Orynicz
... or do it with ssh protocol, just as You described it. On 21 August 2014 14:46, Michal Orynicz michal.oryn...@tieto.com wrote: Hi, the best line of doing this would be going to https://code.wireshark.org/review/, registering there and then pushing Your change to

Re: [Wireshark-dev] Adding a new dissector - beginners guide

2014-08-21 Thread Thomas Wiens
On 21 August 2014 14:46, Michal Orynicz wrote: Hi, the best line of doing this would be going to https://code.wireshark.org/review/, registering there and then pushing Your change to https://code.wireshark.org/review/wireshark . This way the changes will go through review in gerrit, and no

Re: [Wireshark-dev] Defining global filters?

2014-08-21 Thread Jeff Morriss
On 08/19/14 04:27, Anders Broman wrote: -Original Message- From: wireshark-dev-boun...@wireshark.org [mailto:wireshark-dev-boun...@wireshark.org] On Behalf Of Jeff Morriss Sent: den 18 augusti 2014 20:53 To: Developer support list for Wireshark Subject: Re: [Wireshark-dev] Defining

Re: [Wireshark-dev] Adding a new dissector - beginners guide

2014-08-21 Thread Graham Bloice
On 21 August 2014 14:09, Thomas Wiens th.wi...@gmx.de wrote: On 21 August 2014 14:46, Michal Orynicz wrote: Hi, the best line of doing this would be going to https://code.wireshark.org/review/, registering there and then pushing Your change to https://code.wireshark.org/review/wireshark

Re: [Wireshark-dev] Qt License Change

2014-08-21 Thread Tyson Key
Hi, I'm not a lawyer - but judging by that post, and the statements ...we are now adding LGPL v3 as a licensing option to Qt 5.4 in addition to LGPL v2.1, and All modules that existed in Qt 5.3 will still be available under LGPL v2.1. So if you are using Qt under the GPL v2 or LGPL v2.1, nothing

Re: [Wireshark-dev] Adding a new dissector - beginners guide

2014-08-21 Thread Thomas Wiens
On 21 August 2014 15:14, Graham Bloice wrote: Have a look at the Wiki page on submitting patches: http://wiki.wireshark.org/Development/SubmittingPatches which advises using the Gerrit helper git-review Oh man, that's a hard task to upload 4 files. Is this review addon absolute necessary?

[Wireshark-dev] Errors using nmake/VC++2010 EE

2014-08-21 Thread Robert Cragie
Hopefully this is the right mailing list - if not, please tell me where to post. I am getting the following errors building commit 14605754afc3dd0da0ef2da1c534cb4d77cc2d9e using MSVC_VARIANT=MSVC2010EE nmake: Linking wireshark.exe link @C:\Users\Robert\AppData\Local\Temp\nm3CCA.tmp

Re: [Wireshark-dev] Errors using nmake/VC++2010 EE

2014-08-21 Thread Graham Bloice
On 21 August 2014 16:00, Robert Cragie robert.cra...@gridmerge.com wrote: Hopefully this is the right mailing list - if not, please tell me where to post. I am getting the following errors building commit 14605754afc3dd0da0ef2da1c534cb4d77cc2d9e using MSVC_VARIANT=MSVC2010EE nmake:

Re: [Wireshark-dev] Errors using nmake/VC++2010 EE

2014-08-21 Thread Martin Mathieson
I ended up deleting ./ui/gtk/wireshark-tap-register.c On Thu, Aug 21, 2014 at 4:11 PM, Graham Bloice graham.blo...@trihedral.com wrote: On 21 August 2014 16:00, Robert Cragie robert.cra...@gridmerge.com wrote: Hopefully this is the right mailing list - if not, please tell me where to

Re: [Wireshark-dev] Errors using nmake/VC++2010 EE

2014-08-21 Thread Robert Cragie
maintainer-clean target did it (I had tried clean and distclean). Thanks for your help. Robert On 21/08/2014 4:11 PM, Graham Bloice wrote: On 21 August 2014 16:00, Robert Cragie robert.cra...@gridmerge.com mailto:robert.cra...@gridmerge.com wrote: Hopefully this is the right mailing

[Wireshark-dev] Problems with Blades and Teamed NICs

2014-08-21 Thread Herb Falk h...@sisconet.com
I have a project in which we installed the latest Wireshark (but with WinPcap 1.4.2) on a blade server with a teamed NIC. It crashed quite rapidly. Any ideas? Herbert Falk Solutions Architect SISCO, INC. 6605 19 ½ Mile Rd. Sterling Heights, MI 48314 (586) 254-0020 x-105

Re: [Wireshark-dev] Adding a new dissector - beginners guide

2014-08-21 Thread Thomas Wiens
On 21 August 2014 16:25, Graham Bloice wrote: Don't confuse git and Gerrit. Use git to add files to your staging area and then commit them to your repository, and then push the commit to Gerrit, where the Gerrit review process takes over. I've got gerrit review running, and commited the

Re: [Wireshark-dev] Adding a new dissector - beginners guide

2014-08-21 Thread Jeff Morriss
On 08/21/14 13:38, Thomas Wiens wrote: I've got gerrit review running, and commited the files via git. But git review failed. Any suggestions? That's what I've done, after I have added the files to git: Thomas@VORTEX /c/Development/wireshark (s7comm) $ git status On branch s7comm Changes to be

Re: [Wireshark-dev] Adding a new dissector - beginners guide

2014-08-21 Thread Thomas Wiens
On 21 August 2014 21:10, Jeff Morriss wrote: What does git status say at this point? Thomas@VORTEX /c/Development/wireshark (s7comm) $ git status On branch s7comm Changes not staged for commit: (use git add file... to update what will be committed) (use git checkout -- file... to discard

Re: [Wireshark-dev] Adding a new dissector - beginners guide

2014-08-21 Thread Jeff Morriss
On 08/21/14 15:21, Thomas Wiens wrote: On 21 August 2014 21:10, Jeff Morriss wrote: What does git status say at this point? Thomas@VORTEX /c/Development/wireshark (s7comm) $ git status On branch s7comm Changes not staged for commit: (use git add file... to update what will be committed)

Re: [Wireshark-dev] Adding a new dissector - beginners guide

2014-08-21 Thread Thomas Wiens
On 21 August 2014 21:41, Jeff Morriss wrote: For the short term, I'd suggest doing: git stash git review [-f] git stash pop There might be a better answer longer term--maybe one of the guys who actually uses Windows has practical suggestion. It works! Thanks. Is that a problem with

Re: [Wireshark-dev] Adding a new dissector - beginners guide

2014-08-21 Thread Martin Kaiser
Thus wrote Thomas Wiens (th.wi...@gmx.de): I thought, with git add file I am saying: look only on this files and ignore all others. No, that's what you say with svn add. svn tracks files, git tracks changes. git add file means add the changes I made to this file into the next commit. What is

Re: [Wireshark-dev] Adding a new dissector - beginners guide

2014-08-21 Thread Christopher Maynard
Thomas Wiens th.wiens@... writes: On 21 August 2014 21:41, Jeff Morriss wrote: For the short term, I'd suggest doing: git stash git review [-f] git stash pop There might be a better answer longer term--maybe one of the guys who actually uses Windows has practical suggestion.

Re: [Wireshark-dev] Adding a new dissector - beginners guide

2014-08-21 Thread Graham Bloice
On 21 August 2014 21:36, Christopher Maynard christopher.mayn...@gtech.com wrote: Thomas Wiens th.wiens@... writes: On 21 August 2014 21:41, Jeff Morriss wrote: For the short term, I'd suggest doing: git stash git review [-f] git stash pop There might be a better answer

Re: [Wireshark-dev] Problems with Blades and Teamed NICs

2014-08-21 Thread Guy Harris
On Aug 21, 2014, at 10:37 AM, Herb Falk h...@sisconet.com h...@sisconet.com wrote: I have a project in which we installed the latest Wireshark (but with WinPcap 1.4.2) on a blade server with a teamed NIC. It crashed quite rapidly. Any ideas? It meaning Wireshark (i.e., a Wireshark or