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

``struct tunnel_header'' -> u_int32_t in OpenBSD.

Browse Source 
struct tunnel_header is going soon.

Suggested by: Theo
This commit is contained in:
Brian Somers 1998-06-27 12:03:43 +00:00
parent abbfb2cedc
commit 032d427689
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=37187
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
usr.sbin/ppp/bundle.c
View File

@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: bundle.c,v 1.22 1998/06/20 01:36:38 brian Exp $ * $Id: bundle.c,v 1.23 1998/06/24 19:33:30 brian Exp $
*/ */
#include <sys/param.h> #include <sys/param.h>
@ -35,7 +35,6 @@
#include <net/if_dl.h> #include <net/if_dl.h>
#include <netinet/in_systm.h> #include <netinet/in_systm.h>
#include <netinet/ip.h> #include <netinet/ip.h>
#include <net/if_tun.h>
#include <sys/un.h> #include <sys/un.h>
#include <errno.h> #include <errno.h>

3
usr.sbin/ppp/ip.c
View File

@ -17,7 +17,7 @@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
* *
* $Id: ip.c,v 1.43 1998/06/15 19:06:45 brian Exp $ * $Id: ip.c,v 1.44 1998/06/16 19:40:37 brian Exp $
* *
* TODO: * TODO:
* o Return ICMP message for filterd packet * o Return ICMP message for filterd packet
@ -32,7 +32,6 @@
#include <netinet/udp.h> #include <netinet/udp.h>
#include <netinet/tcp.h> #include <netinet/tcp.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <net/if_tun.h>
#include <sys/un.h> #include <sys/un.h>
#ifndef NOALIAS #ifndef NOALIAS

3
usr.sbin/ppp/main.c
View File

@ -17,7 +17,7 @@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
* *
* $Id: main.c,v 1.135 1998/06/16 19:40:39 brian Exp $ * $Id: main.c,v 1.136 1998/06/24 19:33:32 brian Exp $
* *
* TODO: * TODO:
*/ */
@ -28,7 +28,6 @@
#include <netinet/in_systm.h> #include <netinet/in_systm.h>
#include <netinet/ip.h> #include <netinet/ip.h>
#include <sys/un.h> #include <sys/un.h>
#include <net/if_tun.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>

8
usr.sbin/ppp/tun.h
View File

@ -23,19 +23,19 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: tun.h,v 1.3.4.3 1998/05/06 23:50:25 brian Exp $ * $Id: tun.h,v 1.4 1998/05/21 21:48:55 brian Exp $
*/ */
struct tun_data { struct tun_data {
#ifdef __OpenBSD__ #ifdef __OpenBSD__
struct tunnel_header head; u_int32_t head;
#endif #endif
u_char data[MAX_MRU]; u_char data[MAX_MRU];
}; };
#ifdef __OpenBSD__ #ifdef __OpenBSD__
#define tun_fill_header(f,proto) do { (f).head.tun_af = (proto); } while (0) #define tun_fill_header(f,proto) do { (f).head = (proto); } while (0)
#define tun_check_header(f,proto) ((f).head.tun_af == (proto)) #define tun_check_header(f,proto) ((f).head == (proto))
#else #else
#define tun_fill_header(f,proto) do { } while (0) #define tun_fill_header(f,proto) do { } while (0)
#define tun_check_header(f,proto) (1) #define tun_check_header(f,proto) (1)