Re: [Wireshark-dev] Adding a new dissector - beginners guide
On 22 August 2014 16:44, Bill Meier wrote: See my comment to you on the new patch https://code.wireshark.org/review/#/c/3794/ I've got a question to the Reply 'Done' Button in gerrit. Should I use it when I think I've fixed what's mentioned in the comment, or is/should it done by the one who has entered the comment? Is it possible to look back into another gerrit new dissector process like mine? Maybe I can take a look how the normal workflow looks like, and I don't have to ask so many questions. -- Thomas ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:http://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] Adding a new dissector - beginners guide
The Reply 'Done' Button can be used by the developer making the changes, but it doesn't have to be. There just needs to be some indication that it's been addressed (Reply Done or a comment posted after another patch is uploaded is fine) to make the next review go faster. In this particular dissector's case, there were some systematic issues, which generated a large number of comments trying to point each instance out. For those, I don't think you need to do a Reply Done for each, a comment noting the systematic change after you update another patch is fine. For more of the individual issues, you can use Reply Done or just make a general statement like I believe all comments have been addressed. If you disagree or have questions on a particular comment, a conversation can be had with subsequent comments (that's usually easier than using the general comments section when talking about an issue. Michael -Original Message- From: Thomas Wiens th.wi...@gmx.de To: wireshark-dev wireshark-dev@wireshark.org Sent: Sat, Aug 23, 2014 11:39 am Subject: Re: [Wireshark-dev] Adding a new dissector - beginners guide On 22 August 2014 16:44, Bill Meier wrote: See my comment to you on the new patch https://code.wireshark.org/review/#/c/3794/ I've got a question to the Reply 'Done' Button in gerrit. Should I use it when I think I've fixed what's mentioned in the comment, or is/should it done by the one who has entered the comment? Is it possible to look back into another gerrit new dissector process like mine? Maybe I can take a look how the normal workflow looks like, and I don't have to ask so many questions. -- Thomas ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:http://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:http://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] Adding a new dissector - beginners guide
On 22 August 2014 00:03, Graham Bloice wrote: Create a batch file containing something like: REM Environment setup for Wireshark using VS2010 set CYGWIN=nodosfilewarning set WIRESHARK_BASE_DIR=E:\Wireshark set WIRESHARK_TARGET_PLATFORM=win32 set QT5_BASE_DIR=C:\qt\Qt-5.1.1-MSVC2010-win32-ws set VisualStudioVersion=10.0 set WIRESHARK_VERSION_EXTRA=-GMB Adjusting as appropriate for your environment, and you shouldn't need to touch config.nmake except for real changes to it. Note that the VisualStudioVersion env var isn't required for VS2012 onwards (it's added automagically by the VC batch files), and we're moving to VS2013 for master so you should try to move to that as well if you aren't already there. I'm using VS2010EE, and I have just tested that it isn't needed to change config.nmake. I remeber there was a time where it was needed. I've got another question to working on the comments in the review system: Is it good style to push every fixed comment as a single commit, or should I work on all comments, and commit them together as once, with multiple comments? I've looked into older git comments in the review system, but did't found a nice review process with commits, to look what style you prefer. -- Thomas ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:http://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] Adding a new dissector - beginners guide
On 22 August 2014 10:18, Thomas Wiens th.wi...@gmx.de wrote: On 22 August 2014 00:03, Graham Bloice wrote: Create a batch file containing something like: REM Environment setup for Wireshark using VS2010 set CYGWIN=nodosfilewarning set WIRESHARK_BASE_DIR=E:\Wireshark set WIRESHARK_TARGET_PLATFORM=win32 set QT5_BASE_DIR=C:\qt\Qt-5.1.1-MSVC2010-win32-ws set VisualStudioVersion=10.0 set WIRESHARK_VERSION_EXTRA=-GMB Adjusting as appropriate for your environment, and you shouldn't need to touch config.nmake except for real changes to it. Note that the VisualStudioVersion env var isn't required for VS2012 onwards (it's added automagically by the VC batch files), and we're moving to VS2013 for master so you should try to move to that as well if you aren't already there. I'm using VS2010EE, and I have just tested that it isn't needed to change config.nmake. I remeber there was a time where it was needed. I've got another question to working on the comments in the review system: Is it good style to push every fixed comment as a single commit, or should I work on all comments, and commit them together as once, with multiple comments? I've looked into older git comments in the review system, but did't found a nice review process with commits, to look what style you prefer. IMHO, I'd prefer to see reviewer lead changes in one lump as diffing each patch set could be tedious. I'm basically reviewing the final patch as will be merged to master. Others may have a different view. -- Graham Bloice ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:http://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] Adding a new dissector - beginners guide
On 8/22/2014 5:22 AM, Graham Bloice wrote: On 22 August 2014 10:18, Thomas Wiens th.wi...@gmx.de mailto:th.wi...@gmx.de wrote: I've got another question to working on the comments in the review system: Is it good style to push every fixed comment as a single commit, or should I work on all comments, and commit them together as once, with multiple comments? I've looked into older git comments in the review system, but did't found a nice review process with commits, to look what style you prefer. IMHO, I'd prefer to see reviewer lead changes in one lump as diffing each patch set could be tedious. I'm basically reviewing the final patch as will be merged to master. Others may have a different view. -- Graham Bloice +1 ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:http://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] Adding a new dissector - beginners guide
On 22 August 2014 14:51, Thomas Wiens th.wi...@gmx.de wrote: Hi, I've just commited a fixed version. I think I did something wrong. In the review system it is shown as a new version. I used: git commit -a git review As I noted on the review, I think you must have removed the Change-ID: line from the commit message that Gerrit uses to track a new patch set for an existing change. You should have used `git commit --amend` to commit and use the existing commit message. See the Amending a change section in http://wiki.wireshark.org/Development/SubmittingPatches To recover this, we can either consider the latest change as the primary change and abandon the older one (which would effectively throw away Bill's fine comments) or abandon the new change and resubmit your changes as a new patch set to the older change. -- Graham Bloice ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:http://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] Adding a new dissector - beginners guide
On 08/22/14 09:51, Thomas Wiens wrote: Hi, I've just commited a fixed version. I think I did something wrong. In the review system it is shown as a new version. I used: git commit -a git review If you were on the same branch as your original commit (or if you re-downloaded your change with git review -d) you probably should have done git commit -a --amend or otherwise ensured that the Change-ID in the commit message stayed the same. ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:http://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] Adding a new dissector - beginners guide
On 8/22/2014 10:15 AM, Thomas Wiens wrote: On 22 August 2014 16:05, wrote Graham Bloice: As I noted on the review, I think you must have removed the Change-ID: line from the commit message that Gerrit uses to track a new patch set for an existing change. You should have used `git commit --amend` to commit and use the existing commit message. See the Amending a change section in http://wiki.wireshark.org/Development/SubmittingPatches To recover this, we can either consider the latest change as the primary change and abandon the older one (which would effectively throw away Bill's fine comments) or abandon the new change and resubmit your changes as a new patch set to the older change. If it's possible to abandon the new change. What should I do? I think, I'll have to go back to the old change-id-version, and then apply my changes again with git commit --amend. How do I get back to the old version? See my comment to you on the new patch https://code.wireshark.org/review/#/c/3794/ ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:http://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe
[Wireshark-dev] Adding a new dissector - beginners guide
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 think I am ready to go. The main problem is that I'm new to git/gerrit. I don't want to destroy or confuse anything in your code repository, and the wireshark docs don't write it step by step how to do it. I would like to write down what I want to do, and I hope that someone corrects me when I am wrong. What I have done: - created a local copy via git clone https://code.wireshark.org/review/wireshark - I've added four files into epan/dissectors: packet-s7comm.c packet-s7comm_szl_ids.c packet-s7comm.h packet-s7comm_szl_ids.h - I've changed two files: epan/CMakeLists.txt epan/dissectors/Makefile.common config.nmake And the steps to push the files up (haven't done it yet): git add epan/dissectors/packet-s7comm.c git add epan/dissectors/packet-s7comm_szl_ids.c git add epan/dissectors/packet-s7comm.h git add epan/dissectors/packet-s7comm_szl_ids.h git add epan/CMakeLists.txt git add epan/dissectors/Makefile.common git commit -m Add S7COMM protocol -m Dissector T.125 has to be disabled to let this dissector work. and finally: git push ssh://thomas...@code.wireshark.org:29418/wireshark HEAD:refs/for/master/s7comm I don't know how to fix the problem with the concurrent T.125 dissector, seems that my captures are also valid T.125 protocols. Thanks, Thomas Wiens ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:http://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] Adding a new dissector - beginners guide
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 there until it is decided to be ready and safe to be incorporated to the main branch :) On 21 August 2014 14:39, Thomas Wiens th.wi...@gmx.de wrote: 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 think I am ready to go. The main problem is that I'm new to git/gerrit. I don't want to destroy or confuse anything in your code repository, and the wireshark docs don't write it step by step how to do it. I would like to write down what I want to do, and I hope that someone corrects me when I am wrong. What I have done: - created a local copy via git clone https://code.wireshark.org/review/wireshark - I've added four files into epan/dissectors: packet-s7comm.c packet-s7comm_szl_ids.c packet-s7comm.h packet-s7comm_szl_ids.h - I've changed two files: epan/CMakeLists.txt epan/dissectors/Makefile.common config.nmake And the steps to push the files up (haven't done it yet): git add epan/dissectors/packet-s7comm.c git add epan/dissectors/packet-s7comm_szl_ids.c git add epan/dissectors/packet-s7comm.h git add epan/dissectors/packet-s7comm_szl_ids.h git add epan/CMakeLists.txt git add epan/dissectors/Makefile.common git commit -m Add S7COMM protocol -m Dissector T.125 has to be disabled to let this dissector work. and finally: git push ssh://thomas...@code.wireshark.org:29418/wireshark HEAD:refs/for/master/s7comm I don't know how to fix the problem with the concurrent T.125 dissector, seems that my captures are also valid T.125 protocols. Thanks, Thomas Wiens ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:http://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-requ...@wireshark.org ?subject=unsubscribe -- Pozdrawiam / Best regards Michał Orynicz, Software Engineer Tieto Corporation Product Development Services http://www.tieto.com / http://www.tieto.pl --- ASCII: Michal Orynicz location: Swobodna 1 Street, 50-088 Wrocław, Poland room: 5.01 (desk next to 5.08) --- Please note: The information contained in this message may be legally privileged and confidential and protected from disclosure. If the reader of this message is not the intended recipient, you are hereby notified that any unauthorised use, distribution or copying of this communication is strictly prohibited. If you have received this communication in error, please notify us immediately by replying to the message and deleting it from your computer. Thank You. --- Please consider the environment before printing this e-mail. --- Tieto Poland spółka z ograniczoną odpowiedzialnością z siedzibą w Szczecinie, ul. Malczewskiego 26. Zarejestrowana w Sądzie Rejonowym Szczecin-Centrum w Szczecinie, XIII Wydział Gospodarczy Krajowego Rejestru Sądowego pod numerem 124858. NIP: 8542085557. REGON: 812023656. Kapitał zakładowy: 4 271500 PLN ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:http://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] Adding a new dissector - beginners guide
... 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 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 there until it is decided to be ready and safe to be incorporated to the main branch :) On 21 August 2014 14:39, Thomas Wiens th.wi...@gmx.de wrote: 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 think I am ready to go. The main problem is that I'm new to git/gerrit. I don't want to destroy or confuse anything in your code repository, and the wireshark docs don't write it step by step how to do it. I would like to write down what I want to do, and I hope that someone corrects me when I am wrong. What I have done: - created a local copy via git clone https://code.wireshark.org/review/wireshark - I've added four files into epan/dissectors: packet-s7comm.c packet-s7comm_szl_ids.c packet-s7comm.h packet-s7comm_szl_ids.h - I've changed two files: epan/CMakeLists.txt epan/dissectors/Makefile.common config.nmake And the steps to push the files up (haven't done it yet): git add epan/dissectors/packet-s7comm.c git add epan/dissectors/packet-s7comm_szl_ids.c git add epan/dissectors/packet-s7comm.h git add epan/dissectors/packet-s7comm_szl_ids.h git add epan/CMakeLists.txt git add epan/dissectors/Makefile.common git commit -m Add S7COMM protocol -m Dissector T.125 has to be disabled to let this dissector work. and finally: git push ssh://thomas...@code.wireshark.org:29418/wireshark HEAD:refs/for/master/s7comm I don't know how to fix the problem with the concurrent T.125 dissector, seems that my captures are also valid T.125 protocols. Thanks, Thomas Wiens ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:http://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-requ...@wireshark.org ?subject=unsubscribe -- Pozdrawiam / Best regards Michał Orynicz, Software Engineer Tieto Corporation Product Development Services http://www.tieto.com / http://www.tieto.pl --- ASCII: Michal Orynicz location: Swobodna 1 Street, 50-088 Wrocław, Poland room: 5.01 (desk next to 5.08) --- Please note: The information contained in this message may be legally privileged and confidential and protected from disclosure. If the reader of this message is not the intended recipient, you are hereby notified that any unauthorised use, distribution or copying of this communication is strictly prohibited. If you have received this communication in error, please notify us immediately by replying to the message and deleting it from your computer. Thank You. --- Please consider the environment before printing this e-mail. --- Tieto Poland spółka z ograniczoną odpowiedzialnością z siedzibą w Szczecinie, ul. Malczewskiego 26. Zarejestrowana w Sądzie Rejonowym Szczecin-Centrum w Szczecinie, XIII Wydział Gospodarczy Krajowego Rejestru Sądowego pod numerem 124858. NIP: 8542085557. REGON: 812023656. Kapitał zakładowy: 4 271500 PLN -- Pozdrawiam / Best regards Michał Orynicz, Software Engineer Tieto Corporation Product Development Services http://www.tieto.com / http://www.tieto.pl --- ASCII: Michal Orynicz location: Swobodna 1 Street, 50-088 Wrocław, Poland room: 5.01 (desk next to 5.08) --- Please note: The information contained in this message may be legally privileged and confidential and protected from disclosure. If the reader of this message is not the intended recipient, you are hereby notified that any unauthorised use, distribution or copying of this communication is strictly prohibited. If you have received this communication in error, please notify us immediately by replying to the message and deleting it from your computer. Thank You. --- Please consider the environment before printing this e-mail. --- Tieto Poland spółka z ograniczoną odpowiedzialnością z siedzibą w Szczecinie, ul. Malczewskiego 26. Zarejestrowana w Sądzie Rejonowym Szczecin-Centrum w Szczecinie, XIII Wydział Gospodarczy Krajowego Rejestru Sądowego pod numerem 124858. NIP: 8542085557. REGON: 812023656. Kapitał zakładowy: 4 271500 PLN ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:
Re: [Wireshark-dev] Adding a new dissector - beginners guide
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 matter how bad or how good Your code is, it will stay there until it is decided to be ready and safe to be incorporated to the main branch :) Hi Michal, what address would it be in the review system, where I have to push my code? This site: https://code.wireshark.org/review/Documentation/user-upload.html#push_create seems to be not specific to the wireshark sources. I've just registered on the review site of wireshark (although not easy with this openid steps...). What do you think of my previous git-steps? ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:http://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] Adding a new dissector - beginners guide
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 . This way the changes will go through review in gerrit, and no matter how bad or how good Your code is, it will stay there until it is decided to be ready and safe to be incorporated to the main branch :) Hi Michal, what address would it be in the review system, where I have to push my code? This site: https://code.wireshark.org/review/Documentation/user-upload.html#push_create seems to be not specific to the wireshark sources. I've just registered on the review site of wireshark (although not easy with this openid steps...). What do you think of my previous git-steps? Have a look at the Wiki page on submitting patches: http://wiki.wireshark.org/Development/SubmittingPatches which advises using the Gerrit helper git-review -- Graham Bloice ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:http://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] Adding a new dissector - beginners guide
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? Can't get this under windows with git/cygwin and all the other stuff running. Is a change the same when I want to add new files? ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:http://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] Adding a new dissector - beginners guide
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 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 committed: (use git reset HEAD file... to unstage) modified: epan/CMakeLists.txt modified: epan/dissectors/Makefile.common new file: epan/dissectors/packet-s7comm.c new file: epan/dissectors/packet-s7comm.h new file: epan/dissectors/packet-s7comm_szl_ids.c new file: epan/dissectors/packet-s7comm_szl_ids.h Changes not staged for commit: (use git add file... to update what will be committed) (use git checkout -- file... to discard changes in working directory) modified: config.nmake Thomas@VORTEX /c/Development/wireshark (s7comm) $ git commit [s7comm f91e54e] s7comm: Add dissector for S7 Communication 6 files changed, 7176 insertions(+) create mode 100644 epan/dissectors/packet-s7comm.c create mode 100644 epan/dissectors/packet-s7comm.h create mode 100644 epan/dissectors/packet-s7comm_szl_ids.c create mode 100644 epan/dissectors/packet-s7comm_szl_ids.h Thomas@VORTEX /c/Development/wireshark (s7comm) $ git review Errors running git rebase -p -i remotes/origin/master Cannot rebase: You have unstaged changes. Please commit or stash them. ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:http://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] Adding a new dissector - beginners guide
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 committed: (use git reset HEAD file... to unstage) modified: epan/CMakeLists.txt modified: epan/dissectors/Makefile.common new file: epan/dissectors/packet-s7comm.c new file: epan/dissectors/packet-s7comm.h new file: epan/dissectors/packet-s7comm_szl_ids.c new file: epan/dissectors/packet-s7comm_szl_ids.h Changes not staged for commit: (use git add file... to update what will be committed) (use git checkout -- file... to discard changes in working directory) modified: config.nmake Thomas@VORTEX /c/Development/wireshark (s7comm) $ git commit [s7comm f91e54e] s7comm: Add dissector for S7 Communication 6 files changed, 7176 insertions(+) create mode 100644 epan/dissectors/packet-s7comm.c create mode 100644 epan/dissectors/packet-s7comm.h create mode 100644 epan/dissectors/packet-s7comm_szl_ids.c create mode 100644 epan/dissectors/packet-s7comm_szl_ids.h Thomas@VORTEX /c/Development/wireshark (s7comm) $ git review Errors running git rebase -p -i remotes/origin/master Cannot rebase: You have unstaged changes. Please commit or stash them. What does git status say at this point? ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:http://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] Adding a new dissector - beginners guide
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 changes in working directory) modified: config.nmake no changes added to commit (use git add and/or git commit -a) should I do git checkout -- config.nmake ? But then I'll always have to change it when I want to build wireshark on my own. Sorry for my 'dumb' questions, I've no experience with git and only single-user experience with svn. Building a wireshark dissector is easier than getting through git... ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:http://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] Adding a new dissector - beginners guide
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) (use git checkout -- file... to discard changes in working directory) modified: config.nmake no changes added to commit (use git add and/or git commit -a) should I do git checkout -- config.nmake ? But then I'll always have to change it when I want to build wireshark on my own. Oh, yeah, I forgot about that file always being modified on Windows (it's been years since I tried to build on Windows). 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. Sorry for my 'dumb' questions, I've no experience with git and only single-user experience with svn. Building a wireshark dissector is easier than getting through git... It gets easier with time. :-) ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:http://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] Adding a new dissector - beginners guide
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 git review? I thought, with git add file I am saying: look only on this files and ignore all others. It's a bit unpractical when someone is working on another dissector. What is the best way to share samples for my dissector, in the wireshark wiki? Should I create a site for this protocol, although it's only in review? ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:http://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] Adding a new dissector - beginners guide
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 the best way to share samples for my dissector, in the wireshark wiki? Should I create a site for this protocol, although it's only in review? Yes, I'd suggest you create a new page for your protocol. Eventually, the dissector will be merged ;-) ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:http://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] Adding a new dissector - beginners guide
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. It works! Thanks. What actual changes are you making to config.nmake? I think you can, for the most part, simply set environment variables and avoid the need to directly modify config.nmake. - Chris ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:http://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] Adding a new dissector - beginners guide
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 longer term--maybe one of the guys who actually uses Windows has practical suggestion. It works! Thanks. What actual changes are you making to config.nmake? I think you can, for the most part, simply set environment variables and avoid the need to directly modify config.nmake. - Chris Definitely the way to go rather than carrying local mods to config.nmake around all the time. Create a batch file containing something like: REM Environment setup for Wireshark using VS2010 set CYGWIN=nodosfilewarning set WIRESHARK_BASE_DIR=E:\Wireshark set WIRESHARK_TARGET_PLATFORM=win32 set QT5_BASE_DIR=C:\qt\Qt-5.1.1-MSVC2010-win32-ws set VisualStudioVersion=10.0 set WIRESHARK_VERSION_EXTRA=-GMB Adjusting as appropriate for your environment, and you shouldn't need to touch config.nmake except for real changes to it. Note that the VisualStudioVersion env var isn't required for VS2012 onwards (it's added automagically by the VC batch files), and we're moving to VS2013 for master so you should try to move to that as well if you aren't already there. -- Graham Bloice ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:http://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe
