d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge with 4.4-Lite-2: fix bug that caused getsockopt of IP_HDRINCL

Browse Source 
to fail.

Obtained from:	4.4BSD-Lite-2
This commit is contained in:
Garrett Wollman 1995-09-21 19:59:43 +00:00
parent 52834df1e7
commit 25f26ad85a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=10944
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sys/netinet/raw_ip.c
View File

@ -30,8 +30,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* @(#)raw_ip.c 8.2 (Berkeley) 1/4/94
* $Id: raw_ip.c,v 1.20 1995/06/13 17:51:16 wollman Exp $
* @(#)raw_ip.c 8.7 (Berkeley) 5/15/95
* $Id: raw_ip.c,v 1.21 1995/07/24 16:33:51 wollman Exp $
*/
#include <sys/param.h>
@ -200,22 +200,22 @@ rip_ctloutput(op, so, level, optname, m)
switch (optname) {
case IP_HDRINCL:
if (op == PRCO_SETOPT || op == PRCO_GETOPT) {
error = 0;
if (op == PRCO_SETOPT) {
if (m == 0 || *m == 0 || (*m)->m_len < sizeof (int))
return (EINVAL);
if (op == PRCO_SETOPT) {
if (*mtod(*m, int *))
inp->inp_flags |= INP_HDRINCL;
else
inp->inp_flags &= ~INP_HDRINCL;
error = EINVAL;
else if (*mtod(*m, int *))
inp->inp_flags |= INP_HDRINCL;
else
inp->inp_flags &= ~INP_HDRINCL;
if (*m)
(void)m_free(*m);
} else {
(*m)->m_len = sizeof (int);
*mtod(*m, int *) = inp->inp_flags & INP_HDRINCL;
}
return (0);
} else {
*m = m_get(M_WAIT, MT_SOOPTS);
(*m)->m_len = sizeof (int);
*mtod(*m, int *) = inp->inp_flags & INP_HDRINCL;
}
break;
return (error);
case IP_FW_ADD:
case IP_FW_DEL: