[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH hurd 16/30] pfinet: make the demuxers payload-aware
From: |
Justus Winter |
Subject: |
[PATCH hurd 16/30] pfinet: make the demuxers payload-aware |
Date: |
Thu, 27 Nov 2014 14:18:56 +0100 |
* pfinet/ethernet.c (ethernet_demuxer): Make the demuxer payload-aware.
* pfinet/main.c (pfinet_demuxer): Likewise.
---
pfinet/ethernet.c | 20 +++++++++++++++++++-
pfinet/main.c | 12 ++++++++++--
2 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/pfinet/ethernet.c b/pfinet/ethernet.c
index 053fd1b..1678243 100644
--- a/pfinet/ethernet.c
+++ b/pfinet/ethernet.c
@@ -116,12 +116,30 @@ ethernet_demuxer (mach_msg_header_t *inp,
int datalen;
struct ether_device *edev;
struct device *dev = 0;
+ mach_port_t local_port;
if (inp->msgh_id != NET_RCV_MSG_ID)
return 0;
+ if (MACH_MSGH_BITS_LOCAL (inp->msgh_bits) ==
+ MACH_MSG_TYPE_PROTECTED_PAYLOAD)
+ {
+ struct port_info *pi = ports_lookup_payload (NULL,
+ inp->msgh_protected_payload,
+ NULL);
+ if (pi)
+ {
+ local_port = pi->port_right;
+ ports_port_deref (pi);
+ }
+ else
+ local_port = MACH_PORT_NULL;
+ }
+ else
+ local_port = inp->msgh_local_port;
+
for (edev = ether_dev; edev; edev = edev->next)
- if (inp->msgh_local_port == edev->readptname)
+ if (local_port == edev->readptname)
dev = &edev->dev;
if (! dev)
diff --git a/pfinet/main.c b/pfinet/main.c
index 0f1fbfc..8716fdb 100644
--- a/pfinet/main.c
+++ b/pfinet/main.c
@@ -86,8 +86,16 @@ pfinet_demuxer (mach_msg_header_t *inp,
/* We have several classes in one bucket, which need to be demuxed
differently. */
- pi = ports_lookup_port(pfinet_bucket, inp->msgh_local_port,
socketport_class);
-
+ if (MACH_MSGH_BITS_LOCAL (inp->msgh_bits) ==
+ MACH_MSG_TYPE_PROTECTED_PAYLOAD)
+ pi = ports_lookup_payload (pfinet_bucket,
+ inp->msgh_protected_payload,
+ socketport_class);
+ else
+ pi = ports_lookup_port (pfinet_bucket,
+ inp->msgh_local_port,
+ socketport_class);
+
if (pi)
{
ports_port_deref (pi);
--
2.1.3
- [PATCH hurd 05/30] libports: add a payload-aware intrans function, (continued)
- [PATCH hurd 05/30] libports: add a payload-aware intrans function, Justus Winter, 2014/11/27
- [PATCH hurd 06/30] libdiskfs: add payload-aware intrans functions, Justus Winter, 2014/11/27
- [PATCH hurd 09/30] libpager: add a payload-aware intrans function, Justus Winter, 2014/11/27
- [PATCH hurd 08/30] libtrivfs: add payload-aware intrans functions, Justus Winter, 2014/11/27
- [PATCH hurd 11/30] auth: add a payload-aware intrans function, Justus Winter, 2014/11/27
- [PATCH hurd 10/30] libcons: add a payload-aware intrans function, Justus Winter, 2014/11/27
- [PATCH hurd 12/30] console: add a payload-aware intrans function, Justus Winter, 2014/11/27
- [PATCH hurd 13/30] console-client: make the demuxer payload-aware, Justus Winter, 2014/11/27
- [PATCH hurd 15/30] pfinet: add payload-aware intrans functions, Justus Winter, 2014/11/27
- [PATCH hurd 14/30] exec: add payload-aware intrans functions, Justus Winter, 2014/11/27
- [PATCH hurd 16/30] pfinet: make the demuxers payload-aware,
Justus Winter <=
- [PATCH hurd 17/30] pflocal: add payload-aware intrans functions, Justus Winter, 2014/11/27
- [PATCH hurd 19/30] startup: disable default payload to port mapping, Justus Winter, 2014/11/27
- [PATCH hurd 18/30] proc: add payload-aware intrans functions, Justus Winter, 2014/11/27
- [PATCH hurd 23/30] trans/password: add a payload-aware intrans function, Justus Winter, 2014/11/27
- [PATCH hurd 21/30] trans/fakeroot: make the demuxer payload-aware, Justus Winter, 2014/11/27
- [PATCH hurd 22/30] trans/ifsock: add a payload-aware intrans function, Justus Winter, 2014/11/27
- [PATCH hurd 20/30] term: add a payload-aware intrans function, Justus Winter, 2014/11/27
- [PATCH hurd 24/30] trans/streamio: make the translator payload-aware, Justus Winter, 2014/11/27
- [PATCH hurd 29/30] libports: Fix build, Justus Winter, 2014/11/27
- [PATCH hurd 25/30] trans/symlink: disable default payload to port mapping, Justus Winter, 2014/11/27