Skip to content

Commit

Permalink
Make sure Handler#next and Handler#next_extra also wrap the packet as…
Browse files Browse the repository at this point in the history
… a Packets::Raw.
  • Loading branch information
postmodern committed May 31, 2009
1 parent 6573dd4 commit 6727ef7
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions lib/pcap/handler.rb
Expand Up @@ -106,10 +106,12 @@ def dispatch(data=nil,&block)

def next
header = PacketHeader.new
data = PCap.pcap_next(@pcap,header)
bytes = PCap.pcap_next(@pcap,header)

return [nil, nil] if data.null?
return [header, data]

raw = Packets::Raw.new(bytes,header.captured,@datalink)
return [header, raw]
end

def next_extra
Expand All @@ -123,7 +125,10 @@ def next_extra
raise(ReadError,"the 'savefile' contains no more packets",caller)
end

return [header_ptr.get_pointer(0), data_ptr.get_pointer(0)]
header = header_ptr.get_pointer(0)
raw = Packets::Raw.new(data_ptr.get_pointer(0),header.captured,@datalink)

return [header, raw]
end

def open_dump(path)
Expand Down

0 comments on commit 6727ef7

Please sign in to comment.