am e5446feb: Add <linux/ipsec.h> and <linux/if_pppolac.h> for VPN support.

Merge commit 'e5446feb21a991426fb683d077a1a8ca5831ac0f'

* commit 'e5446feb21a991426fb683d077a1a8ca5831ac0f':
  Add <linux/ipsec.h> and <linux/if_pppolac.h> for VPN support.
This commit is contained in:
David 'Digit' Turner 2009-05-25 08:36:49 -07:00 committed by The Android Open Source Project
commit 38460b45bc
4 changed files with 88 additions and 2 deletions

View File

@ -0,0 +1,29 @@
/****************************************************************************
****************************************************************************
***
*** This header was automatically generated from a Linux kernel header
*** of the same name, to make information necessary for userspace to
*** call into the kernel available to libc. It contains only constants,
*** structures, and macros generated from the original header, and thus,
*** contains no copyrightable information.
***
****************************************************************************
****************************************************************************/
#ifndef __LINUX_IF_PPPOLAC_H
#define __LINUX_IF_PPPOLAC_H
#include <linux/socket.h>
#include <linux/types.h>
#define PX_PROTO_OLAC 2
struct sockaddr_pppolac {
sa_family_t sa_family;
unsigned int sa_protocol;
int udp_socket;
struct __attribute__((packed)) {
__u16 tunnel, session;
} local, remote;
} __attribute__((packed));
#endif

View File

@ -0,0 +1,56 @@
/****************************************************************************
****************************************************************************
***
*** This header was automatically generated from a Linux kernel header
*** of the same name, to make information necessary for userspace to
*** call into the kernel available to libc. It contains only constants,
*** structures, and macros generated from the original header, and thus,
*** contains no copyrightable information.
***
****************************************************************************
****************************************************************************/
#ifndef _LINUX_IPSEC_H
#define _LINUX_IPSEC_H
#include <linux/pfkeyv2.h>
#define IPSEC_PORT_ANY 0
#define IPSEC_ULPROTO_ANY 255
#define IPSEC_PROTO_ANY 255
enum {
IPSEC_MODE_ANY = 0,
IPSEC_MODE_TRANSPORT = 1,
IPSEC_MODE_TUNNEL = 2,
IPSEC_MODE_BEET = 3
};
enum {
IPSEC_DIR_ANY = 0,
IPSEC_DIR_INBOUND = 1,
IPSEC_DIR_OUTBOUND = 2,
IPSEC_DIR_FWD = 3,
IPSEC_DIR_MAX = 4,
IPSEC_DIR_INVALID = 5
};
enum {
IPSEC_POLICY_DISCARD = 0,
IPSEC_POLICY_NONE = 1,
IPSEC_POLICY_IPSEC = 2,
IPSEC_POLICY_ENTRUST = 3,
IPSEC_POLICY_BYPASS = 4
};
enum {
IPSEC_LEVEL_DEFAULT = 0,
IPSEC_LEVEL_USE = 1,
IPSEC_LEVEL_REQUIRE = 2,
IPSEC_LEVEL_UNIQUE = 3
};
#define IPSEC_MANUAL_REQID_MAX 0x3fff
#define IPSEC_REPLAYWSIZE 32
#endif

View File

@ -82,4 +82,3 @@ struct msm_snd_endpoint {
#define SND_GET_ENDPOINT _IOWR(SND_IOCTL_MAGIC, 5, struct msm_snd_endpoint *)
#endif

View File

@ -73,7 +73,9 @@ for path in sources:
print "cleaning: %-*s -> %-*s (%s)" % ( 35, path, 35, dst_path, r )
usePerforce = os.environ.has_key("ANDROID_PRODUCT_OUT")
# We don't use Perforce anymore, but just in case, define ANDROID_USE_P4
# in your environment if you think you need it.
usePerforce = os.environ.has_key("ANDROID_USE_P4")
if usePerforce:
b.updateP4Files()