Sorry for flooding, another small fix for tcpprep -

--- tcpreplay-3.4.1.a/src/tree.c        2009-04-22 13:46:59.000000000 +0300
+++ tcpreplay-3.4.1.b/src/tree.c        2009-04-30 10:00:34.000000000 +0300
@@ -307,7 +307,7 @@
     tcpr_tree_t *node = NULL, *finder = NULL;

     finder = new_tree();
-    finder->family = AF_INET;
+    finder->family = AF_INET6;
     finder->u.ip6 = *addr;

     node = RB_FIND(tcpr_data_tree_s, &treeroot, finder);

Now tcpprep's auto modes work, except router mode - I have no idea how 
to make it work for ipv6.


Aaron Turner wrote:
> Sounds good... keep it coming. :)
>
> -Aaron
>
> On Tue, Apr 28, 2009 at 2:28 AM, Stas Grabois <sa...@radware.com> wrote:
>   
>> I've run the tests and fixed two problems. I've also added 3 new ipv6 tests.
>> Patches attached.
>>
>> I've noticed that tcpprep doesn't work in auto mode with v6 files, so
>> another patch will follow.
>>
>> Stas.
>>
>> Aaron Turner wrote:
>>     
>>> So I'm going through the patch... damn it's big. :)  As I'm going
>>> through the code do you think you could write up a description of what
>>> new functionality and how to use it?  Ie: what options now support
>>> IPv6, what they do and how to use them?  What limitations (if any)
>>> exist and how the functionality differs from the IPv4 use case.  I'll
>>> use that info to update the online documentation and man pages.
>>>
>>> Anyways, I've created a 3.4.2 milestone release.  ETA 2-3 weeks I'm
>>> guessing.
>>>
>>> On Wed, Apr 22, 2009 at 10:42 PM, Aaron Turner <synfina...@gmail.com>
>>> wrote:
>>>
>>>       
>>>> Thanks!
>>>>
>>>> On Wed, Apr 22, 2009 at 10:33 PM, Stas Grabois <sa...@radware.com> wrote:
>>>>
>>>>         
>>>>> No problem - attached.
>>>>>
>>>>>           
>>>> --
>>>> Aaron Turner
>>>> http://synfin.net/
>>>> http://tcpreplay.synfin.net/ - Pcap editing and replay tools for Unix &
>>>> Windows
>>>> Those who would give up essential Liberty, to purchase a little temporary
>>>> Safety, deserve neither Liberty nor Safety.
>>>>   -- Benjamin Franklin
>>>>
>>>>
>>>>         
>>>
>>>
>>>       
>> --- tcpreplay-3.4.1.new.with_tests/src/tcpprep.c        2009-04-22
>> 13:46:01.000000000 +0300
>> +++ tcpreplay-3.4.1.working/src/tcpprep.c       2009-04-28
>> 10:48:22.000000000 +0300
>> @@ -379,7 +379,7 @@
>>                   pcap_datalink(pcap), &buffptr);
>>             }
>>
>> -            if (ip_hdr && ip6_hdr) {
>> +            if (!ip_hdr && !ip6_hdr) {
>>                 dbg(2, "Packet isn't IP");
>>
>>                 /* we don't want to cache these packets twice */
>> --- tcpreplay-3.4.1.new.with_tests/src/tree.c   2009-04-22
>> 13:46:59.000000000 +0300
>> +++ tcpreplay-3.4.1.working/src/tree.c  2009-04-28 11:08:45.000000000 +0300
>> @@ -712,7 +712,7 @@
>>     eth_hdr = (eth_hdr_t *) (data);
>>
>>     /* prevent issues with byte alignment, must memcpy */
>> -    memcpy(&ether_type, eth_hdr + 12, 2);
>> +    memcpy(&ether_type, (u_char*)eth_hdr + 12, 2);
>>
>>     if (ether_type == htons(ETHERTYPE_IP)) {
>>         memcpy(&ip_hdr, (data + TCPR_ETH_H), TCPR_IPV4_H);
>>
>> ------------------------------------------------------------------------------
>> Register Now & Save for Velocity, the Web Performance & Operations
>> Conference from O'Reilly Media. Velocity features a full day of
>> expert-led, hands-on workshops and two days of sessions from industry
>> leaders in dedicated Performance & Operations tracks. Use code vel09scf
>> and Save an extra 15% before 5/3. http://p.sf.net/sfu/velocityconf
>> _______________________________________________
>> Tcpreplay-users mailing list
>> Tcpreplay-users@lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/tcpreplay-users
>> Support Information: http://tcpreplay.synfin.net/trac/wiki/Support
>>
>>     
>
>
>
>   


------------------------------------------------------------------------------
Register Now & Save for Velocity, the Web Performance & Operations 
Conference from O'Reilly Media. Velocity features a full day of 
expert-led, hands-on workshops and two days of sessions from industry 
leaders in dedicated Performance & Operations tracks. Use code vel09scf 
and Save an extra 15% before 5/3. http://p.sf.net/sfu/velocityconf
_______________________________________________
Tcpreplay-users mailing list
Tcpreplay-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tcpreplay-users
Support Information: http://tcpreplay.synfin.net/trac/wiki/Support

Reply via email to