mbox

[0/2,PULL] slirp: Fix for ARP assert and DSN search DHCP option

Message ID cover.1353334465.git.jan.kiszka@siemens.com
State New
Headers show

Pull-request

git://git.kiszka.org/qemu.git queues/slirp

Message

Jan Kiszka Nov. 19, 2012, 2:14 p.m. UTC 
The following changes since commit ce34cf72fe508b27a78f83c184142e8d1e6a048a:

  Merge remote-tracking branch 'awilliam/tags/vfio-pci-for-qemu-1.3.0-rc0' into staging (2012-11-14 08:53:40 -0600)

are available in the git repository at:

  git://git.kiszka.org/qemu.git queues/slirp

Klaus Stengel (1):
      slirp: Add domain-search option to slirp's DHCP server

Nickolai Zeldovich (1):
      slirp: Don't crash on packets from 0.0.0.0/8.

 net/slirp.c         |   35 +++++-
 qapi-schema.json    |    4 +
 qemu-options.hx     |   18 +++-
 slirp/Makefile.objs |    2 +-
 slirp/arp_table.c   |    4 +-
 slirp/bootp.c       |   12 ++
 slirp/dnssearch.c   |  314 +++++++++++++++++++++++++++++++++++++++++++++++++++
 slirp/libslirp.h    |    3 +-
 slirp/slirp.c       |    8 +-
 slirp/slirp.h       |    5 +
 10 files changed, 395 insertions(+), 10 deletions(-)
 create mode 100644 slirp/dnssearch.c


CC: Klaus Stengel <Klaus.Stengel@asamnet.de>
CC: Nickolai Zeldovich <nickolai@csail.mit.edu>

Klaus Stengel (1):
  slirp: Add domain-search option to slirp's DHCP server

Nickolai Zeldovich (1):
  slirp: Don't crash on packets from 0.0.0.0/8.

 net/slirp.c         |   35 +++++-
 qapi-schema.json    |    4 +
 qemu-options.hx     |   18 +++-
 slirp/Makefile.objs |    2 +-
 slirp/arp_table.c   |    4 +-
 slirp/bootp.c       |   12 ++
 slirp/dnssearch.c   |  314 +++++++++++++++++++++++++++++++++++++++++++++++++++
 slirp/libslirp.h    |    3 +-
 slirp/slirp.c       |    8 +-
 slirp/slirp.h       |    5 +
 10 files changed, 395 insertions(+), 10 deletions(-)
 create mode 100644 slirp/dnssearch.c