Skip to content

More packet memory stuff #141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

More packet memory stuff #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a4caeb1
click/etherswitch: bail out on OOM
Nov 14, 2018
1868fae
click/fromfile: plug mmap leak in error path
Nov 14, 2018
7aec8b8
click/hashtable: assert that operator[] does not return a NULL reference
Nov 14, 2018
f2a3821
click/icmp: bail out on OOM
Nov 14, 2018
2191f9c
Fix f2a3821
tbarbette Nov 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion elements/etherswitch/etherswitch.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ EtherSwitch::broadcast(int source, Packet *p)
for (int i = 0; i < n && w > 0; i++) {
if (pfr.bv[i]) {
Packet *pp = (w > 1 ? p->clone() : p);
output(i).push(pp);
if (pp)
output(i).push(pp);
w--;
}
}
Expand Down
2 changes: 1 addition & 1 deletion elements/icmp/icmpsendpings.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ ICMPPingSource::make_packet(WritablePacket *q)
q->set_ip_header(nip, sizeof(click_ip));
q->timestamp_anno().assign_now();

if (_receiver)
if (q && _receiver)
_receiver->send_timestamp[icp->icmp_sequence] = q->timestamp_anno();

return q;
Expand Down
4 changes: 3 additions & 1 deletion include/click/hashtable.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -951,7 +951,9 @@ template <typename T>
typename HashTable<T>::value_type &
HashTable<T>::operator[](key_const_reference key)
{
return *find_insert(key);
HashTable_iterator<T> i = find_insert(key);
assert(i.get());
return *i;
}

template <typename T>
Expand Down
5 changes: 5 additions & 0 deletions lib/fromfile.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,11 @@ FromFile::read_buffer_mmap(ErrorHandler *errh)
return error(errh, "mmap: %s", strerror(errno));

_data_packet = Packet::make((unsigned char *)mmap_data, _len, munmap_destructor, 0);
if (!_data_packet) {
munmap_destructor((unsigned char *)mmap_data, _len, NULL);
return error(errh, "Packet::make failed");
}

_buffer = _data_packet->data();
_file_offset = _mmap_off;
_mmap_off += _len;
Expand Down