Merge pull request #12798 from donaldsharp/rib_match_multicast

[mirror_frr.git] / ldpd / ldpe.h

diff --git a/ldpd/ldpe.h b/ldpd/ldpe.h
index 0f650a86d335f330b614b0ff70ec5a18d9a3c287..e799538b628290bcb464da49c83257ef43de4089 100644 (file)
--- a/ldpd/ldpe.h
+++ b/ldpd/ldpe.h
@@ -1,21 +1,10 @@
+// SPDX-License-Identifier: ISC
 /*     $OpenBSD$ */
 
 /*
  * Copyright (c) 2013, 2016 Renato Westphal <renato@openbsd.org>
  * Copyright (c) 2009 Michele Marchetto <michele@openbsd.org>
  * Copyright (c) 2004, 2005, 2008 Esben Norby <norby@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 #ifndef _LDPE_H_
@@ -148,7 +137,7 @@ extern struct nbr_pid_head   nbrs_by_pid;
 
 /* accept.c */
 void   accept_init(void);
-int    accept_add(int, int (*)(struct thread *), void *);
+int accept_add(int, void (*)(struct thread *), void *);
 void   accept_del(int);
 void   accept_pause(void);
 void   accept_unpause(void);
@@ -292,8 +281,8 @@ int                  gen_ldp_hdr(struct ibuf *, uint16_t);
 int                     gen_msg_hdr(struct ibuf *, uint16_t, uint16_t);
 int                     send_packet(int, int, union ldpd_addr *,
                            struct iface_af *, void *, size_t);
-int                     disc_recv_packet(struct thread *);
-int                     session_accept(struct thread *);
+void disc_recv_packet(struct thread *thread);
+void session_accept(struct thread *thread);
 void                    session_accept_nbr(struct nbr *, int);
 void                    session_shutdown(struct nbr *, uint32_t, uint32_t,
                            uint32_t);