[prev in list] [next in list] [prev in thread] [next in thread] 

List:       haiku-commits
Subject:    [haiku-commits] [S] Change in haiku[master]: network/stack: inherit selected options from the parent
From:       Gerrit <review () review ! haiku-os ! org>
Date:       2024-04-30 18:53:33
Message-ID: a01ad4daf78ddd9244c9f8c16ae72432135c7b54-HTML () review ! haiku-os ! org
[Download RAW message or body]

From Jérôme Duval <jerome.duval@gmail.com>:

Jérôme Duval has uploaded this change for review. ( \
https://review.haiku-os.org/c/haiku/+/7658?usp=email )


Change subject: network/stack: inherit selected options from the parent socket
......................................................................

network/stack: inherit selected options from the parent socket

similar commit in FreeBSD:
https://github.com/freebsd/freebsd-src/commit/d29b95ecc0d049406d27a6c11939d40a46658733
                
---
M src/add-ons/kernel/network/stack/net_socket.cpp
1 file changed, 11 insertions(+), 1 deletion(-)



  git pull ssh://git.haiku-os.org:22/haiku refs/changes/58/7658/1

diff --git a/src/add-ons/kernel/network/stack/net_socket.cpp \
b/src/add-ons/kernel/network/stack/net_socket.cpp index 18d7767..9811114 100644
--- a/src/add-ons/kernel/network/stack/net_socket.cpp
+++ b/src/add-ons/kernel/network/stack/net_socket.cpp
@@ -648,7 +648,7 @@
 	// inherit parent's properties
 	socket->send = parent->send;
 	socket->receive = parent->receive;
-	socket->options = parent->options & ~SO_ACCEPTCONN;
+	socket->options = parent->options & (SO_KEEPALIVE | SO_DONTROUTE | SO_LINGER | \
SO_OOBINLINE);  socket->linger = parent->linger;
 	socket->owner = parent->owner;
 	memcpy(&socket->address, &parent->address, parent->address.ss_len);

--
To view, visit https://review.haiku-os.org/c/haiku/+/7658?usp=email
To unsubscribe, or for help writing mail filters, visit \
https://review.haiku-os.org/settings

Gerrit-Project: haiku
Gerrit-Branch: master
Gerrit-Change-Id: I370d39c603a3f54158aa2eaf2ad5a30e744beda0
Gerrit-Change-Number: 7658
Gerrit-PatchSet: 1
Gerrit-Owner: Jérôme Duval <jerome.duval@gmail.com>
Gerrit-MessageType: newchange


[Attachment #3 (text/html)]

<p>Jérôme Duval has uploaded this change for <strong>review</strong>.</p><p><a \
href="https://review.haiku-os.org/c/haiku/+/7658?usp=email">View Change</a></p><pre \
style="font-family: monospace,monospace; white-space: pre-wrap;">network/stack: \
inherit selected options from the parent socket<br><br>similar commit in \
FreeBSD:<br>https://github.com/freebsd/freebsd-src/commit/d29b95ecc0d049406d27a6c11939d40a46658733<br>---<br>M \
src/add-ons/kernel/network/stack/net_socket.cpp<br>1 file changed, 11 insertions(+), \
1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: \
pre-wrap;">git pull ssh://git.haiku-os.org:22/haiku refs/changes/58/7658/1</pre><pre \
style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git \
a/src/add-ons/kernel/network/stack/net_socket.cpp \
b/src/add-ons/kernel/network/stack/net_socket.cpp</span><br><span>index \
18d7767..9811114 100644</span><br><span>--- \
a/src/add-ons/kernel/network/stack/net_socket.cpp</span><br><span>+++ \
b/src/add-ons/kernel/network/stack/net_socket.cpp</span><br><span>@@ -648,7 +648,7 \
@@</span><br><span> 	// inherit parent&#39;s properties</span><br><span> \
socket-&gt;send = parent-&gt;send;</span><br><span> 	socket-&gt;receive = \
parent-&gt;receive;</span><br><span style="color: hsl(0, 100%, \
40%);">-	socket-&gt;options = parent-&gt;options &amp; \
~SO_ACCEPTCONN;</span><br><span style="color: hsl(120, 100%, \
40%);">+	socket-&gt;options = parent-&gt;options &amp; (SO_KEEPALIVE | SO_DONTROUTE | \
SO_LINGER | SO_OOBINLINE);</span><br><span> 	socket-&gt;linger = \
parent-&gt;linger;</span><br><span> 	socket-&gt;owner = \
parent-&gt;owner;</span><br><span> 	memcpy(&amp;socket-&gt;address, \
&amp;parent-&gt;address, \
parent-&gt;address.ss_len);</span><br><span></span><br></pre><p>To view, visit <a \
href="https://review.haiku-os.org/c/haiku/+/7658?usp=email">change 7658</a>. To \
unsubscribe, or for help writing mail filters, visit <a \
href="https://review.haiku-os.org/settings">settings</a>.</p><div itemscope \
itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" \
itemtype="http://schema.org/ViewAction"><link itemprop="url" \
href="https://review.haiku-os.org/c/haiku/+/7658?usp=email"/><meta itemprop="name" \
content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: haiku </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: \
I370d39c603a3f54158aa2eaf2ad5a30e744beda0 </div> <div style="display:none"> \
Gerrit-Change-Number: 7658 </div> <div style="display:none"> Gerrit-PatchSet: 1 \
</div> <div style="display:none"> Gerrit-Owner: Jérôme Duval \
&lt;jerome.duval@gmail.com&gt; </div> <div style="display:none"> Gerrit-MessageType: \
newchange </div>



[prev in list] [next in list] [prev in thread] [next in thread]