| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Tell the build system to copy notice files.android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-mr2-preview-2android-n-mr2-preview-1android-n-mr1-preview-2android-n-mr1-preview-1android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7android-n-iot-release-ihome-igv1android-n-iot-preview-4android-n-iot-preview-2android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1nougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devnougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-wear-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-iot-releasenougat-dr1-releasenougat-devn-mr2-preview-1n-mr1-preview-1n-iot-preview-4n-iot-preview-2 | Ying Wang | 2016-04-08 | 1 | -0/+4 |
| | | | | | | | | | By default the build system only looks for $(LOCAL_PATH)/NOTICE. In this case we need to explicitly set LOCAL_NOTICE_FILE. Bug: 27844589 Change-Id: Ia6d19e50b132e1bd9f8f3b82e5d66280638ad867 | ||||
| * | am c4afcd7f: am 16752d9f: (-s ours) am f2a192e3: Merge "Add \'-w\' option to ↵android-n-preview-2android-n-preview-1n-preview-2n-preview-1 | Yusuke Sato | 2015-08-27 | 0 | -0/+0 |
| |\ | | | | | | | | | | | ip[6]tables-restore" * commit 'c4afcd7f3bfbc3b0c74eb024d2263cc6cc40b9d3': | ||||
| | * | am 16752d9f: (-s ours) am f2a192e3: Merge "Add \'-w\' option to ↵brillo-m9-releasebrillo-m9-devbrillo-m8-releasebrillo-m8-devbrillo-m10-releasebrillo-m10-dev | Yusuke Sato | 2015-08-27 | 0 | -0/+0 |
| | |\ | | | | | | | | | | | | | | | | ip[6]tables-restore" * commit '16752d9f7a92d4404a65296080f581d821e52e11': | ||||
| | | * | am f2a192e3: Merge "Add \'-w\' option to ip[6]tables-restore"brillo-m7-releasebrillo-m7-mr-devbrillo-m7-dev | Yusuke Sato | 2015-08-26 | 2 | -6/+30 |
| | | |\ | | | | | | | | | | | | | | | | | * commit 'f2a192e32451d50910c432dbc66352602fda5136': Add '-w' option to ip[6]tables-restore | ||||
| * | | | | am 508f1659: am 0304f3bd: (-s ours) am 745484a5: Merge "Add ↵ | Yusuke Sato | 2015-08-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | ip[6]tables-restore and ip[6]tables-save to /system/bin" * commit '508f165911045f283deaccc86f925daffe2867f2': | ||||
| | * | | | am 0304f3bd: (-s ours) am 745484a5: Merge "Add ip[6]tables-restore and ↵ | Yusuke Sato | 2015-08-27 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | ip[6]tables-save to /system/bin" * commit '0304f3bd45922a134b001955529bc72dc7525303': | ||||
| | | * | | am 745484a5: Merge "Add ip[6]tables-restore and ip[6]tables-save to /system/bin" | Yusuke Sato | 2015-08-19 | 1 | -0/+8 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | * commit '745484a52c87b3d8d87f1e055713c3cec4744326': Add ip[6]tables-restore and ip[6]tables-save to /system/bin | ||||
| * | | | | | am 968fa2ee: am a2981544: (-s ours) am 592f0b0c: Merge "build: wildcard ↵ | Dan Willemsen | 2015-08-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | isn\'t guaranteed to be sorted" * commit '968fa2eecc668bb07d8eaecd5293f6a3a527f957': | ||||
| | * | | | | am a2981544: (-s ours) am 592f0b0c: Merge "build: wildcard isn\'t guaranteed ↵ | Dan Willemsen | 2015-08-27 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | to be sorted" * commit 'a2981544ac2f64fcf942881362057bf81e9a195e': | ||||
| | | * | | | am 592f0b0c: Merge "build: wildcard isn\'t guaranteed to be sorted" | Dan Willemsen | 2015-08-12 | 1 | -3/+3 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * commit '592f0b0cbfc7d9c6e88c00d963e9cad5a8e7374f': build: wildcard isn't guaranteed to be sorted | ||||
| * | | | | | | am 3dad54a1: am a41cf02b: (-s ours) am 53b5e80f: Merge "extensions: ↵ | Lorenzo Colitti | 2015-08-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libxt_socket: add --restore-skmark option" * commit '3dad54a15e5719f6e2e5c70871943616c1df0a04': | ||||
| | * | | | | | am a41cf02b: (-s ours) am 53b5e80f: Merge "extensions: libxt_socket: add ↵ | Lorenzo Colitti | 2015-08-27 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --restore-skmark option" * commit 'a41cf02b99cfc7fc6f577d79a746424239de2cf6': | ||||
| | | * | | | | am 53b5e80f: Merge "extensions: libxt_socket: add --restore-skmark option" | Lorenzo Colitti | 2015-08-12 | 2 | -0/+79 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '53b5e80f3deffc6134f6b2582746b3474d0cffd1': extensions: libxt_socket: add --restore-skmark option | ||||
| * | | | | | | | am b48d9516: am f2a192e3: Merge "Add \'-w\' option to ip[6]tables-restore" | Yusuke Sato | 2015-08-26 | 2 | -6/+30 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b48d95166b2b01228ca278e71df41d0876ea1fa9': Add '-w' option to ip[6]tables-restore | ||||
| | * | | | | | | am f2a192e3: Merge "Add \'-w\' option to ip[6]tables-restore" | Yusuke Sato | 2015-08-26 | 2 | -6/+30 |
| | |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | * commit 'f2a192e32451d50910c432dbc66352602fda5136': Add '-w' option to ip[6]tables-restore | ||||
| | | * | | | | | Merge "Add '-w' option to ip[6]tables-restore" | Yusuke Sato | 2015-08-26 | 2 | -6/+30 |
| | | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | | | * | | | | Add '-w' option to ip[6]tables-restore | Yusuke Sato | 2015-08-21 | 2 | -6/+30 |
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so ip[6]tables-restrore and ip[6]tables commands can be safely executed in parallel. Bug: 21725996 Change-Id: I4d0c0e5ff9e7881d9ebdfa5d4c733029703bb8de | ||||
| * | | | | | | am d26b57b6: am 745484a5: Merge "Add ip[6]tables-restore and ↵ | Yusuke Sato | 2015-08-19 | 1 | -0/+8 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ip[6]tables-save to /system/bin" * commit 'd26b57b65706376ab01abefcb093a52ced73afa4': Add ip[6]tables-restore and ip[6]tables-save to /system/bin | ||||
| | * | | | | | am 745484a5: Merge "Add ip[6]tables-restore and ip[6]tables-save to /system/bin" | Yusuke Sato | 2015-08-19 | 1 | -0/+8 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '745484a52c87b3d8d87f1e055713c3cec4744326': Add ip[6]tables-restore and ip[6]tables-save to /system/bin | ||||
| | | * | | | | Merge "Add ip[6]tables-restore and ip[6]tables-save to /system/bin" | Yusuke Sato | 2015-08-19 | 1 | -0/+8 |
| | | |\ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | | | * | | | Add ip[6]tables-restore and ip[6]tables-save to /system/bin | Yusuke Sato | 2015-08-18 | 1 | -0/+8 |
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | Bug: 21725996 Change-Id: I948dc7282b51c05fe795ead9a764c2dcc9705001 | ||||
| * | | | | | am 34030eac: am 592f0b0c: Merge "build: wildcard isn\'t guaranteed to be sorted" | Dan Willemsen | 2015-08-12 | 1 | -3/+3 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '34030eac10964de1cba20720e58b4bbba5f13dfe': build: wildcard isn't guaranteed to be sorted | ||||
| | * | | | | am 592f0b0c: Merge "build: wildcard isn\'t guaranteed to be sorted" | Dan Willemsen | 2015-08-12 | 1 | -3/+3 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | * commit '592f0b0cbfc7d9c6e88c00d963e9cad5a8e7374f': build: wildcard isn't guaranteed to be sorted | ||||
| | | * | | | Merge "build: wildcard isn't guaranteed to be sorted"android-m-preview-2 | Dan Willemsen | 2015-08-12 | 1 | -3/+3 |
| | | |\ \ \ | | | |_|/ | | |/| | | |||||
| | | | * | | build: wildcard isn't guaranteed to be sorted | Dan Willemsen | 2015-08-06 | 1 | -3/+3 |
| | | |/ / | | | | | | | | | | | | | | | | | | | | | To prevent this from changing between builds, wrap in $(sort ) Change-Id: Ib7758346c9d5a6752bca6d547ccdd5ce7344fb49 | ||||
| * | | | | am 1eb9371a: am 53b5e80f: Merge "extensions: libxt_socket: add ↵ | Lorenzo Colitti | 2015-08-12 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | --restore-skmark option" * commit '1eb9371aeb2be36673223cc1c6ce274466f1d2c3': extensions: libxt_socket: add --restore-skmark option | ||||
| | * | | | am 53b5e80f: Merge "extensions: libxt_socket: add --restore-skmark option" | Lorenzo Colitti | 2015-08-12 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | | | | | | | * commit '53b5e80f3deffc6134f6b2582746b3474d0cffd1': extensions: libxt_socket: add --restore-skmark option | ||||
| | | * | | Merge "extensions: libxt_socket: add --restore-skmark option" | Lorenzo Colitti | 2015-07-20 | 2 | -0/+79 |
| | | |\ \ | |||||
| | | | * | | extensions: libxt_socket: add --restore-skmark option | Harout Hedeshian | 2015-07-21 | 2 | -0/+79 |
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | xt_socket is useful for matching sockets with IP_TRANSPARENT and taking some action on the matching packets. However, it lacks the ability to match only a small subset of transparent sockets. Suppose there are 2 applications, each with its own set of transparent sockets. The first application wants all matching packets dropped, while the second application wants them forwarded somewhere else. Add the ability to retore the skb->mark from the sk_mark. The mark is only restored if a matching socket is found and the transparent / nowildcard conditions are satisfied. Now the 2 hypothetical applications can differentiate their sockets based on a mark value set with SO_MARK. iptables -t mangle -I PREROUTING -m socket --transparent \ --restore-skmark -j action iptables -t mangle -A action -m mark --mark 10 -j action2 iptables -t mangle -A action -m mark --mark 11 -j action3 Signed-off-by: Harout Hedeshian <harouth@codeaurora.org> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Change-Id: I8f95f053bf32181bf0928f0a86f594212a1c767b | ||||
| * | | | | Merge "package version metadata for external/" | Bill Napier | 2015-07-30 | 1 | -0/+3 |
| |\ \ \ \ | |/ / / |/| | | | |||||
| | * | | | package version metadata for external/ | Damien Miller | 2015-06-02 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will be used for automated notification of external vulnerability reports. Change-Id: Idb22ae6b4986dad5e9a5c8b907ea104cf1132394 | ||||
| * | | | | am de2fa713: extensions: libxt_socket: add --restore-skmark option | Harout Hedeshian | 2015-07-29 | 2 | -0/+79 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | * commit 'de2fa7133374831bcb5080a43e567e2e41f84ee7': extensions: libxt_socket: add --restore-skmark option | ||||
| | * | | | | extensions: libxt_socket: add --restore-skmark optionandroid-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r68android-6.0.1_r67android-6.0.1_r66android-6.0.1_r65android-6.0.1_r63android-6.0.1_r62android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r55android-6.0.1_r54android-6.0.1_r53android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r5android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r45android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21android-6.0.1_r20android-6.0.1_r18android-6.0.1_r17android-6.0.1_r16android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r41android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11marshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devmarshmallow-dr-releasemarshmallow-dr-dragon-releasemarshmallow-dr-dev | Harout Hedeshian | 2015-07-29 | 2 | -0/+79 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | xt_socket is useful for matching sockets with IP_TRANSPARENT and taking some action on the matching packets. However, it lacks the ability to match only a small subset of transparent sockets. Suppose there are 2 applications, each with its own set of transparent sockets. The first application wants all matching packets dropped, while the second application wants them forwarded somewhere else. Add the ability to retore the skb->mark from the sk_mark. The mark is only restored if a matching socket is found and the transparent / nowildcard conditions are satisfied. Now the 2 hypothetical applications can differentiate their sockets based on a mark value set with SO_MARK. iptables -t mangle -I PREROUTING -m socket --transparent \ --restore-skmark -j action iptables -t mangle -A action -m mark --mark 10 -j action2 iptables -t mangle -A action -m mark --mark 11 -j action3 Bug: 20663075 Signed-off-by: Harout Hedeshian <harouth@codeaurora.org> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> (cherry picked from commit 3b20fc71c99acd604d635deacef99769e36191b5) Change-Id: If746841dea9db9f1c7ad1d74ed37fa13109e37ff | ||||
| * | | | | | am fbb436cf: Merge "xt_socket: add --nowildcard flag" into mnc-dr-dev | Lorenzo Colitti | 2015-07-29 | 0 | -0/+0 |
| |\| | | | | |_|_|/ |/| | | | | | | | | | | | * commit 'fbb436cf1271a2868f5c55009bb8bf044a6aa809': xt_socket: add --nowildcard flag | ||||
| | * | | | Merge "xt_socket: add --nowildcard flag" into mnc-dr-dev | Lorenzo Colitti | 2015-07-29 | 2 | -0/+69 |
| | |\ \ \ | | |/ / | |/| | | |||||
| | | * | | xt_socket: add --nowildcard flag | Eric Dumazet | 2015-07-29 | 2 | -0/+69 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | xt_socket module can be a nice replacement to conntrack module in some cases (SYN filtering for example) But it lacks the ability to match the 3rd packet of TCP handshake (ACK coming from the client). Add a XT_SOCKET_NOWILDCARD flag to disable the wildcard mechanism The wildcard is the legacy socket match behavior, that ignores LISTEN sockets bound to INADDR_ANY (or ipv6 equivalent) iptables -I INPUT -p tcp --syn -j SYN_CHAIN iptables -I INPUT -m socket -j ACCEPT Bug: 20663075 Signed-off-by: Eric Dumazet <edumazet@google.com> Cc: Patrick McHardy <kaber@trash.net> Cc: Jesper Dangaard Brouer <brouer@redhat.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> | ||||
| * | | | | am 9bc8d9b4: Merge "xt_socket: add --nowildcard flag" | Lorenzo Colitti | 2015-06-12 | 2 | -0/+69 |
| |\ \ \ \ | |/ / / |/| | / | | |/ | |/| | * commit '9bc8d9b4e3b0229b0e9a8007cac49e1093e58f21': xt_socket: add --nowildcard flag | ||||
| | * | | Merge "xt_socket: add --nowildcard flag"android-m-preview-1 | Lorenzo Colitti | 2015-06-12 | 2 | -0/+69 |
| | |\ \ | |||||
| | | * | | xt_socket: add --nowildcard flag | Eric Dumazet | 2015-06-11 | 2 | -0/+69 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | xt_socket module can be a nice replacement to conntrack module in some cases (SYN filtering for example) But it lacks the ability to match the 3rd packet of TCP handshake (ACK coming from the client). Add a XT_SOCKET_NOWILDCARD flag to disable the wildcard mechanism The wildcard is the legacy socket match behavior, that ignores LISTEN sockets bound to INADDR_ANY (or ipv6 equivalent) iptables -I INPUT -p tcp --syn -j SYN_CHAIN iptables -I INPUT -m socket -j ACCEPT Signed-off-by: Eric Dumazet <edumazet@google.com> Cc: Patrick McHardy <kaber@trash.net> Cc: Jesper Dangaard Brouer <brouer@redhat.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> | ||||
| * | | | Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into ↵android-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r4android-6.0.0_r3android-6.0.0_r2android-6.0.0_r1marshmallow-releasemarshmallow-devmarshmallow-cts-release | Prerepa Viswanadham | 2015-03-24 | 0 | -0/+0 |
| |\ \ \ | |/ / |/| / | |/ | master_merge | ||||
| | * | extensions: libxt_TEE: Trim kernel struct to allow deletionandroid-5.1.1_r5android-5.1.1_r28android-5.1.1_r22android-5.1.1_r17android-5.1.1_r12lollipop-mr1-wfc-release | Loganaden Velvindron | 2015-03-19 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct trimming of userspacesize to fix deletions. Fixes: Bugzilla #884. The rule having TEE target with '--oif' option cannot be deleted by iptables command. $ iptables -I INPUT -i foo -j TEE --gateway x.x.x.x --oif bar $ iptables -D INPUT -i foo -j TEE --gateway x.x.x.x --oif bar iptables: No chain/target/match by that name. [Cherry-pick of iptables df3741332d86629a8fdd267930e0a249803f6aa8] Signed-off-by: Loganaden Velvindron <logan@elandsys.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Change-Id: Ieb43487811669d502074330a0cba7c8d4c9c7446 | ||||
| * | | Merge "extensions: libxt_TEE: Trim kernel struct to allow deletion"android-wear-5.1.1_r1android-wear-5.1.0_r1android-m-previewmaster-soong | Lorenzo Colitti | 2015-03-19 | 1 | -2/+2 |
| |\ \ | |||||
| | * | | extensions: libxt_TEE: Trim kernel struct to allow deletion | Loganaden Velvindron | 2015-03-19 | 1 | -2/+2 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct trimming of userspacesize to fix deletions. Fixes: Bugzilla #884. The rule having TEE target with '--oif' option cannot be deleted by iptables command. $ iptables -I INPUT -i foo -j TEE --gateway x.x.x.x --oif bar $ iptables -D INPUT -i foo -j TEE --gateway x.x.x.x --oif bar iptables: No chain/target/match by that name. [Cherry-pick of iptables df3741332d86629a8fdd267930e0a249803f6aa8] Signed-off-by: Loganaden Velvindron <logan@elandsys.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Change-Id: Ieb43487811669d502074330a0cba7c8d4c9c7446 | ||||
| * | | Merge "Remove unused My_intermediates variable from iptables/Android.mk" | Narayan Kamath | 2015-02-27 | 1 | -1/+0 |
| |\ \ | |||||
| | * | | Remove unused My_intermediates variable from iptables/Android.mk | Trevor Drake | 2015-02-27 | 1 | -1/+0 |
| |/ / | | | | | | | | | | | | | | | calling local-intermediates-dir before LOCAL_MODULE and LOCAL_MODULE_CLASS have been set will break the build system when using the mm option ( build modules in the current directory ) Change-Id: Ib89dc80fb6f7ca77207d2114d1237477ac2d7a1f | ||||
| * | | Merge "Suppress clang warning on checking array address." | Chih-Hung Hsieh | 2014-12-13 | 1 | -1/+5 |
| |\ \ | |||||
| | * | | Suppress clang warning on checking array address. | Chih-Hung Hsieh | 2014-12-09 | 1 | -1/+5 |
| |/ / | | | | | | | | | | | libxt_recent.c compares address of array 'info->name' with null. Change-Id: I3be0763ab261439cb9d6881ef2b6ba0ea29e7f4e | ||||
| * | | Merge "Clean up unused variable in makefile."android-wear-5.0.0_r1lollipop-wear-release | Dan Albert | 2014-12-08 | 1 | -1/+0 |
| |\ \ | |||||
| | * | | Clean up unused variable in makefile. | Dan Albert | 2014-11-25 | 1 | -1/+0 |
| |/ / | | | | | | | | | | | | | | | This variable is unused, and will actually break the build system if this makefile is included first, since `local-intermediates-dir` requires LOCAL_MODULE and LOCAL_MODULE_CLASS to be set before calling. Change-Id: I326e9f184bb00f53bf81c59cdbeddb4be801e1e3 | ||||
| * | | Merge "Add MODULE_LICENSE and NOTICE files"android-l-preview_r2l-preview | Conley Owens | 2014-10-15 | 2 | -0/+339 |
| |\ \ | |/ |/| | |||||
 |
index : platform_external_iptables | |
| Unnamed repository; edit this file 'description' to name the repository. |
| aboutsummaryrefslogtreecommitdiffstats |