diff options
| author | Elliott Hughes <enh@google.com> | 2013-11-12 23:07:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-11-12 23:07:24 +0000 |
| commit | 5ea8006691664b7e6d46d6a6dc889eac91b7fe37 (patch) | |
| tree | 0f5ca7f3c0430897e1ab05e7513a15052fe43e26 | |
| parent | 141f77c33bb1f6e4e19b7baff08d963f341e9eb7 (diff) | |
| parent | 04bd5fc5f03afd5de3e977f67ca644436407b211 (diff) | |
| download | mtpd-lollipop-mr1-release.tar.gz | |
Merge "Fix mtpd to build with both old and uapi headers."android-wear-5.0.0_r1android-l-preview_r2android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-wear-releaselollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-releasel-previewidea133-weekly-releaseidea133
| -rw-r--r-- | mtpd.h | 28 |
1 files changed, 28 insertions, 0 deletions
@@ -17,6 +17,34 @@ #ifndef __MTPD_H__ #define __MTPD_H__ +#if !defined(PX_PROTO_OLAC) +#define USING_UAPI +#endif + +#if defined(USING_UAPI) +/* This stuff isn't in uapi. */ +#define PX_PROTO_OLAC 3 +#define PX_PROTO_OPNS 4 + +struct sockaddr_pppopns { + sa_family_t sa_family; + unsigned int sa_protocol; + int tcp_socket; + uint16_t local; + uint16_t remote; +} __attribute__((packed)); + +struct sockaddr_pppolac { + sa_family_t sa_family; + unsigned int sa_protocol; + int udp_socket; + struct __attribute__((packed)) { + uint16_t tunnel; + uint16_t session; + } local, remote; +} __attribute__((packed)); +#endif + /* The socket to the server. */ extern int the_socket; |