Merge pull request #13246 from opensourcerouting/rip-bfd

[mirror_frr.git] / babeld / net.c

diff --git a/babeld/net.c b/babeld/net.c
index eaed51d20a6e47e6e1a195d4ab7783ec980ee1c2..15ea2de0ff124dfa12c2217f35a2b8108501a05f 100644 (file)
--- a/babeld/net.c
+++ b/babeld/net.c
@@ -1,41 +1,12 @@
-/*  
- *  This file is free software: you may copy, redistribute and/or modify it  
- *  under the terms of the GNU General Public License as published by the  
- *  Free Software Foundation, either version 2 of the License, or (at your  
- *  option) any later version.  
- *  
- *  This file is distributed in the hope that it will be useful, but  
- *  WITHOUT ANY WARRANTY; without even the implied warranty of  
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU  
- *  General Public License for more details.  
- *  
- *  You should have received a copy of the GNU General Public License  
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.  
- *  
- * This file incorporates work covered by the following copyright and  
- * permission notice:  
- *  
+// SPDX-License-Identifier: MIT
+/*
 Copyright (c) 2007, 2008 by Juliusz Chroboczek
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <unistd.h>
 #include <fcntl.h>
 #include <string.h>
@@ -44,12 +15,15 @@ THE SOFTWARE.
 #include <sys/uio.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
+#include <netinet/in_systm.h>
+#include <netinet/ip.h>
 #include <arpa/inet.h>
 #include <errno.h>
 
 #include "babeld.h"
 #include "util.h"
 #include "net.h"
+#include "sockopt.h"
 
 int
 babel_socket(int port)
@@ -86,6 +60,8 @@ babel_socket(int port)
     if(rc < 0)
         goto fail;
 
+    setsockopt_ipv6_tclass (s, IPTOS_PREC_INTERNETCONTROL);
+
     rc = fcntl(s, F_GETFL, 0);
     if(rc < 0)
         goto fail;
@@ -151,7 +127,7 @@ babel_send(int s,
     iovec[1].iov_base = buf2;
     iovec[1].iov_len = buflen2;
     memset(&msg, 0, sizeof(msg));
-    msg.msg_name = (struct sockaddr*)sin;
+    msg.msg_name = sin;
     msg.msg_namelen = slen;
     msg.msg_iov = iovec;
     msg.msg_iovlen = 2;