aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-07-15[automerger skipped] Empty Merge Android U (ab/10368041) am: 617440c8d2 -s ↵HEADandroid-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29mastermainandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseXin Li
ours am: 3b4ca7f135 -s ours am: 3b4fdfa1f2 -s ours am: 2e8ad630e0 -s ours am skip reason: Merged-In Ib526096b0ab9cbbcd3ac691268e050952ff7e6fe with SHA-1 ecbde7e0a0 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/tcpdump/+/24087870 Change-Id: If61cea376a376c15b2b0624fa094886481653246 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-15[automerger skipped] Empty Merge Android U (ab/10368041) am: 617440c8d2 -s ↵Xin Li
ours am: 3b4ca7f135 -s ours am: 3b4fdfa1f2 -s ours am skip reason: Merged-In Ib526096b0ab9cbbcd3ac691268e050952ff7e6fe with SHA-1 ecbde7e0a0 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/tcpdump/+/24087870 Change-Id: Ieb413815538f0750557d2d5ecdc6650058e8190d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-15[automerger skipped] Empty Merge Android U (ab/10368041) am: 617440c8d2 -s ↵Xin Li
ours am: 3b4ca7f135 -s ours am skip reason: Merged-In Ib526096b0ab9cbbcd3ac691268e050952ff7e6fe with SHA-1 ecbde7e0a0 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/tcpdump/+/24087870 Change-Id: Id594706c2f2d6fd99da221d7f3618035e1f7b427 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-15[automerger skipped] Empty Merge Android U (ab/10368041) am: 617440c8d2 -s oursXin Li
am skip reason: Merged-In Ib526096b0ab9cbbcd3ac691268e050952ff7e6fe with SHA-1 ecbde7e0a0 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/tcpdump/+/24087870 Change-Id: I4a810c3b52a5144e5f4b065561eb7296044b3c6b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14Empty Merge Android U (ab/10368041)Xin Li
Bug: 291102124 Merged-In: Ib526096b0ab9cbbcd3ac691268e050952ff7e6fe Change-Id: I4acabfb943fffd22880b442a20be1c6ec10ad804
2023-07-14Merge "Upgrade tcpdump to tcpdump-4.99.4" into main am: d231da0df5 am: ↵Sadaf Ebrahimi
79017393c7 am: 86a2c2f7a5 am: df81e44a42 am: e392a02c26 am: 7306c49316 Original change: https://android-review.googlesource.com/c/platform/external/tcpdump/+/2655820 Change-Id: Ia88eb950c60e23911322af47301409aea16399bd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-13Merge "Upgrade tcpdump to tcpdump-4.99.4" into main am: d231da0df5 am: ↵Sadaf Ebrahimi
79017393c7 am: 86a2c2f7a5 am: df81e44a42 am: e392a02c26 Original change: https://android-review.googlesource.com/c/platform/external/tcpdump/+/2655820 Change-Id: I607d3bce5937d05633023a486a622051e46676f7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-13Merge "Upgrade tcpdump to tcpdump-4.99.4" into main am: d231da0df5 am: ↵Sadaf Ebrahimi
79017393c7 am: 86a2c2f7a5 am: df81e44a42 Original change: https://android-review.googlesource.com/c/platform/external/tcpdump/+/2655820 Change-Id: Ia74728e9efcc1d26a7703de898437757301c5143 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-13Merge "Upgrade tcpdump to tcpdump-4.99.4" into main am: d231da0df5 am: ↵Sadaf Ebrahimi
79017393c7 am: 86a2c2f7a5 Original change: https://android-review.googlesource.com/c/platform/external/tcpdump/+/2655820 Change-Id: I3ee398ca8adb4e53e10705ee2f78973e6bf698b7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12Merge "Upgrade tcpdump to tcpdump-4.99.4" into main am: d231da0df5 am: ↵Sadaf Ebrahimi
79017393c7 Original change: https://android-review.googlesource.com/c/platform/external/tcpdump/+/2655820 Change-Id: I1b925a33b26b5d6d1dc388d1ae0bf6f8cba1526b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12Merge "Upgrade tcpdump to tcpdump-4.99.4" into main am: d231da0df5Sadaf Ebrahimi
Original change: https://android-review.googlesource.com/c/platform/external/tcpdump/+/2655820 Change-Id: I78f5e8fbb4b8ca463f313cd038cd380fdc128f75 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12Merge "Upgrade tcpdump to tcpdump-4.99.4" into mainSadaf Ebrahimi
2023-07-12Upgrade tcpdump to tcpdump-4.99.4Sadaf Ebrahimi
This project was upgraded with external_updater. Usage: tools/external_updater/updater.sh update tcpdump For more info, check https://cs.android.com/android/platform/superproject/+/main:tools/external_updater/README.md Test: TreeHugger Change-Id: Id4c2a06443d8bb21789a5396fd6bc10d9f762bd2
2023-04-07This is tcpdump 4.99.4.Denis Ovsienko
2023-04-07CHANGES: Replace the strftime() entry.Denis Ovsienko
2023-04-07Have a common routine for converting dates and times to strings.Guy Harris
Have a routine that takes a buffer, a strftime format, and a struct tm * as arguments, and: * checks whether the struct tm * is null and, if so, returns a string indicating that the date and time couldn't be converted; * otherwise, passes it to strftime(), along with the buffer and the format argument and, if strftime() returns 0, meaning the string didn't fit into the buffer and thus that the buffer's contents are undefined, returns a string indicating that the date and time didn't fit into the buffer; * otherwise, returns a pointer to the buffer. Call that routine instead of directly calling strftime() in printers; that prevents printing a buffer with undefined data if the buffer isn't big enough for the string. Also, when generating file names using an strftime format, check the return value of strftime() to make sure the buffer didn't overflow.
2023-04-07CHANGES: Add a change backported to 4.99Francois-Xavier Le Bail
(cherry picked from commit b3c37e3fbbf81b02df219d8f6c2eb21e6fdf86d1)
2023-04-07Update config.{guess,sub}, timestamps 2023-01-01,2023-01-21Francois-Xavier Le Bail
From repository git://git.savannah.gnu.org/config.git (cherry picked from commit d308963f46cf29054fac5c706c100d2379ff1d8f)
2023-04-02Rename a test. The protocol is IEEE 802.11Francois-Xavier Le Bail
(cherry picked from commit 2fd087001db4c9d6a9a307f73317a0d379d8074d)
2023-04-02Makefile.in: Remove print-pflog.c from EXTRA_DIST and TAGFILESFrancois-Xavier Le Bail
It is now in LIBNETDISSECT_SRC because it is no longer built as an option. (cherry picked from commit 01f8d84898ebaf192095066d04daec1f6eb6b0f1) [skip ci]
2023-04-02RIPng: Print the protocol name when the version is invalidFrancois-Xavier Le Bail
Update the output of a test accordingly. (cherry picked from commit efc775d05163ac3591b30341ca944007fdc5753a)
2023-04-02Makefile.in: Add print-smb.o and smbutil.o in CLEANFILESFrancois-Xavier Le Bail
They are not in LIBNETDISSECT_OBJ because they are optionally built. (cherry picked from commit 523f7537a3950934a76704d2aa2f9d34a7ce0ecd) [skip ci]
2023-04-02CHANGES: List more backported commits. [skip ci]Denis Ovsienko
2023-04-02man: Spell TCP header flags names. [skip ci]Denis Ovsienko
In the prose use the names from respective registry [1], which says: * "PSH", not "PUSH", * "CWR", not "ECN CWR", and * "ECE", not "ECN-Echo". This does not resolve all known inconsistencies related to TCP flags, but at least makes the problem smaller. 1: https://www.iana.org/assignments/tcp-parameters/tcp-parameters.xhtml (cherry picked from commit eb2f8839ac53daa4d80fad2809be55d997678397)
2023-02-26man: Add the TCP flag names tcp-ece and tcp-cwrFrancois-Xavier Le Bail
State that these flag names became available when linking with libpcap 1.9.0 or later. (cherry picked from commit ded255a178d7a41ebb29d7c29f649fd09d3ece2a) [skip ci]
2023-02-20Makefile.in: Update whitespacecheck target to show spaces before tabsFrancois-Xavier Le Bail
2023-02-20Fix remaining spaces before tabs in indentationFrancois-Xavier Le Bail
[skip ci]
2023-02-20Fix spaces before tabs in indentationFrancois-Xavier Le Bail
(cherry picked from commit 59d37c7ec5a7ce949db07d50594cca68fa724443) [skip ci]
2023-02-20CHANGES: Add a change backported to 4.99Francois-Xavier Le Bail
(cherry picked from commit 373a2ec94c46966343d4b648fae52e99f5c7b1d0) [skip ci]
2023-02-20ICMPv6: Update the output to show a RPL DAO field nameFrancois-Xavier Le Bail
(cherry picked from commit ca513b2d06ad2db95ab4041cecb4702edc27c0df)
2023-02-20CHANGES: Add a change backported to 4.99Francois-Xavier Le Bail
(backported from commit 7c7bd4d8af52ac71d0bed7ecb4b962e28be980f8) [skip ci]
2023-02-20CHANGES: add a change backported to 4.99.x [skip ci]Guy Harris
(cherry picked from commit 1e9b9807f9af6b80b0ecbc7067e1791b291e58f7)
2023-02-20DNS: Sync types with IANAMatthew Martin
IANA reference: https://www.iana.org/assignments/dns-parameters/dns-parameters.xhtml Remove the UNSPECA type parsing as IANA has that query type number assigned to NID now. (cherry picked from commit ad090fd01a2642959da14fedcf0e2dcd7076f0af)
2023-02-17Geneve: Fix the Geneve UDP port testFrancois-Xavier Le Bail
GENEVE_PORT (6081) is a destination port. (cherry picked from commit 560575198406265c510771de10b6c86381f5dd9a)
2023-02-15Avoid a space before a tab in a commentFrancois-Xavier Le Bail
This change avoids a false positive when looking for bad indentations. Moreover: Replace the deprecated 'egrep' variant by 'grep -E'. (cherry picked from commit 17fb9526b1feff7875e3ec00427dfcb8096e8621) [skip ci]
2023-01-30configure, CMakeLists.txt: don't check for snprintf().Guy Harris
It's specified by the C90 standard (and, as I remember, by the C89 standard, although I no longer have my paper copy); no need to worry about ancient environments that lack it, and we have some cases where we call it in code not protected by #ifdef HAVE_STRFTIME/#endif and haven't seen any reports of problems. (cherry picked from commit af51eea2909c10b540dba6c1b2a1e7e18e230993)
2023-01-28CHANGES: Add a change backported to 4.99Francois-Xavier Le Bail
(cherry picked from commit ce5f51e082b50f10c253c06291f1c8cf2a51362f) [skip ci]
2023-01-28smbutil.c: Fix the strftime buffer sizeFrancois-Xavier Le Bail
tm_year is an int, thus 'yyyy' for '%Y' is not enough. This avoids a stack buffer overflow in some cases. (cherry picked from commit 5caf4211264afa7d98820c6cbb6a03c27a388fec)
2023-01-24Merge "Upgrade tcpdump to tcpdump-4.99.3" am: 2f2be04784 am: 388f05fa79 am: ↵android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-devSadaf Ebrahimi
bc66278394 Original change: https://android-review.googlesource.com/c/platform/external/tcpdump/+/2400457 Change-Id: Ib526096b0ab9cbbcd3ac691268e050952ff7e6fe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-24Merge "Upgrading tcpdump METADATA from ARCHIVE to GIT" am: 912286679e am: ↵Sadaf Ebrahimi
a1e0f128a6 am: f702efac38 Original change: https://android-review.googlesource.com/c/platform/external/tcpdump/+/2400456 Change-Id: I574d36692065d58f297e4b5618007d3214fe2332 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-24Merge "Initial repository for tcpdump" am: 25b71de83b am: 43005c92f9 am: ↵Sadaf Ebrahimi
612aa5bf6a Original change: https://android-review.googlesource.com/c/platform/external/tcpdump/+/2400455 Change-Id: I2f85fc4b68bce2385cd49d6937f8af5dcf22ed8a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-24Merge "Upgrade tcpdump to tcpdump-4.99.3" am: 2f2be04784 am: 388f05fa79Sadaf Ebrahimi
Original change: https://android-review.googlesource.com/c/platform/external/tcpdump/+/2400457 Change-Id: If49bc9ec79fceb13033fc9124174721c18fb8e6d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-24Merge "Upgrading tcpdump METADATA from ARCHIVE to GIT" am: 912286679e am: ↵Sadaf Ebrahimi
a1e0f128a6 Original change: https://android-review.googlesource.com/c/platform/external/tcpdump/+/2400456 Change-Id: Ib0ff4e3f21941f2513ce1c2fd462d5910febac0d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-24Merge "Initial repository for tcpdump" am: 25b71de83b am: 43005c92f9Sadaf Ebrahimi
Original change: https://android-review.googlesource.com/c/platform/external/tcpdump/+/2400455 Change-Id: Ife5145cfd4721c606a31e932f94051d78e979316 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-24Merge "Upgrade tcpdump to tcpdump-4.99.3" am: 2f2be04784android-u-beta-1-gplSadaf Ebrahimi
Original change: https://android-review.googlesource.com/c/platform/external/tcpdump/+/2400457 Change-Id: Iaca2bf826d4eb814489d7807bec7e30395022815 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-24Merge "Upgrading tcpdump METADATA from ARCHIVE to GIT" am: 912286679eSadaf Ebrahimi
Original change: https://android-review.googlesource.com/c/platform/external/tcpdump/+/2400456 Change-Id: I89f24da6e11f040ceb7d813d539cf4d3017fbe52 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-24Merge "Initial repository for tcpdump" am: 25b71de83bSadaf Ebrahimi
Original change: https://android-review.googlesource.com/c/platform/external/tcpdump/+/2400455 Change-Id: I06e541ade17a2b79bc3826dea7305257482a44a4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-24Merge "Upgrade tcpdump to tcpdump-4.99.3"Sadaf Ebrahimi
2023-01-24Merge "Upgrading tcpdump METADATA from ARCHIVE to GIT"Sadaf Ebrahimi
2023-01-24Merge "Initial repository for tcpdump"Sadaf Ebrahimi
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 07:12:47 +0000