forked from osmocom/wireshark
Compare commits
407 Commits
master
...
osmith/wip
Author | SHA1 | Date |
---|---|---|
Daniel Willmann | adc002a045 | |
Oliver Smith | 8ca21cbe7a | |
Gerald Combs | e42cbf6a41 | |
Gerald Combs | 1307804147 | |
Gerald Combs | dac0e6b083 | |
Martin Mathieson | e479ced643 | |
Martin Mathieson | aa0f0f65e7 | |
Clément Notin | bc38bea800 | |
Taisuke Sasaki | fb2ed68545 | |
Martin Mathieson | 7799b0f577 | |
Alexis La Goutte | cbbe611c7a | |
ZhongYao Luo | 2450e2220b | |
João Valverde | 60dee56e4c | |
Martin Tschoepe | f6362dd30c | |
Thomas Dreibholz | 40496f3185 | |
Pascal Quantin | 490fe2684b | |
Andreas Schultz | be7bb332fe | |
Prince Paul | 3e42a64f6f | |
Prince Paul | 3e836977cd | |
Joakim Andersson | 427cd8fd42 | |
Joakim Andersson | 3b330cf647 | |
Joakim Andersson | 4cbec00089 | |
Joakim Andersson | de9d5f76ff | |
Andre Luyer | 3afd332455 | |
Gerald Combs | bf35c11265 | |
Pascal Quantin | 9b21140c8e | |
Guy Harris | bb4c32b75e | |
Guy Harris | 5318290a05 | |
Gerald Combs | c23daa12fe | |
Guy Harris | 9fc3cd04a8 | |
Gerald Combs | 2d967ebad1 | |
Gerald Combs | 69977f3109 | |
Guy Harris | 1afaa65fdd | |
Guy Harris | 755a470644 | |
Guy Harris | 930d8f763c | |
Guy Harris | 4a34fa38f1 | |
Guy Harris | 18c4baa9f3 | |
Guy Harris | 18e13337ea | |
Gerald Combs | 9ea88b3ee2 | |
João Valverde | 018ea00ff2 | |
Alexis La Goutte | 64bedfad27 | |
Uli Heilmeier | ad6a337dde | |
Gerald Combs | 61c2ba5b16 | |
Christian Reusch | 9eb1c665c6 | |
Guy Harris | 57776c7641 | |
Simon Barber | 793d971db2 | |
Gerald Combs | 17a3789ad8 | |
Gerald Combs | fd6a83dfec | |
Gerald Combs | 6357ac1405 | |
Guy Harris | 65a554b976 | |
Guy Harris | 73fe213954 | |
Gerald Combs | e8938c10a2 | |
Pascal Quantin | 225352970b | |
Gerald Combs | 389025227e | |
João Valverde | 7308ab766b | |
Gerald Combs | e6eb1d7370 | |
John Thacker | 0d8be1fb79 | |
John Thacker | b20a77698d | |
Gerald Combs | 13546c7a18 | |
Pascal Quantin | 113062025d | |
Gerald Combs | 1d22f8f6b6 | |
Gerald Combs | 6da1114152 | |
John Thacker | ffe59d91a1 | |
Guy Harris | 67ca5e98c7 | |
Guy Harris | 7438c67f06 | |
Guy Harris | ac7673bd0a | |
Guy Harris | 7c969e2deb | |
Guy Harris | f032d776e6 | |
Gerald Combs | 191e6744f9 | |
Guy Harris | ecf1616e35 | |
Guy Harris | faea31d0a1 | |
Guy Harris | 54b8952150 | |
Guy Harris | 93e794c373 | |
Guy Harris | d072335658 | |
Guy Harris | 0e6c7c7bb2 | |
Guy Harris | 161e765500 | |
Nardi Ivan | 4a17759938 | |
Guy Harris | dd0c60a001 | |
Guy Harris | 82b0eac6af | |
Gerald Combs | 4a5dece155 | |
Gerald Combs | 5254d5e822 | |
Gerald Combs | b45185f1c0 | |
Gerald Combs | 28aecbba66 | |
Gerald Combs | 728ae2de5f | |
Gerald Combs | 2410d8b6eb | |
Gerald Combs | 66cba93e39 | |
Gerald Combs | c1cf92283c | |
Gerald Combs | 219978c50d | |
Gerald Combs | b191395e0e | |
Guy Harris | 347f60c37b | |
Uli Heilmeier | ab13858b7f | |
Gerald Combs | aa169ab224 | |
Gerald Combs | 31a3ec04a8 | |
Gerald Combs | 7db1feb42c | |
Gerald Combs | 6548abd191 | |
Gerald Combs | 04f9d3e097 | |
Gerald Combs | 19d03ef4ac | |
naf | eee907aeb5 | |
Gerald Combs | cc954fae7e | |
Stefan Metzmacher | e49430b4d3 | |
Uli Heilmeier | 0c1743656f | |
Simon Holesch | d28ded7244 | |
Michael Tuexen | 489fc40a49 | |
Gerald Combs | cb432b878e | |
Guy Harris | cdca1f2d03 | |
Loris Degioanni | 716dd09605 | |
Loris Degioanni | 4e7df5af01 | |
Loris Degioanni | 180c96beb8 | |
Loris Degioanni | e94d9f4549 | |
Gerald Combs | 1be17e2d30 | |
David Perry | f1677bd31c | |
Vahap Emin Agaogullari | 3e35fecccb | |
Guy Harris | 4a7ddb6b1a | |
Gerald Combs | 636f7f1c09 | |
Guy Harris | 193b1fc545 | |
Gerald Combs | 6ef6e8f607 | |
Nardi Ivan | 3bca4e3b3f | |
Uli Heilmeier | 6b072b63f0 | |
Uli Heilmeier | 06e20df535 | |
Guy Harris | 878e8058a6 | |
Guy Harris | d0fdecc6b6 | |
Gerald Combs | 76f01ea726 | |
Darius Davis | b2d8858b9a | |
Guy Harris | f63d93957d | |
Guy Harris | fcefe78a67 | |
Dario Lombardo | 2974b30150 | |
Guy Harris | 95c7c1c0f2 | |
Guy Harris | b5d65c0074 | |
Guy Harris | 0b8c953533 | |
Guy Harris | f1f937dd26 | |
Michal Ruprich | d0e6ad310b | |
Guy Harris | f6cfb8362c | |
Guy Harris | 82f93c42f7 | |
Guy Harris | 7e0360206e | |
Gerald Combs | 6cbf30fa88 | |
Guy Harris | 3d9603e051 | |
Guy Harris | 7a7da50fc3 | |
John Thacker | 4482949ddc | |
Guy Harris | 53a7984431 | |
Guy Harris | 392d01c2cc | |
Alexis La Goutte | 20a013b835 | |
Alexis La Goutte | fbbaa3d03d | |
Guy Harris | fd940a364c | |
Dr. Lars Völker | 3a657cb4fb | |
Gerald Combs | e8421b1a0e | |
Guy Harris | 580812874a | |
Martin Mathieson | 2f7cf6e528 | |
Gerald Combs | 45aed9966c | |
Gerald Combs | c33f6306cb | |
Gerald Combs | 144380001b | |
Gerald Combs | 733c52cc0b | |
Gerald Combs | f8acbe7598 | |
Nardi Ivan | 0de80702bd | |
Gerald Combs | 8c997a57da | |
Nardi Ivan | 16bc7095b9 | |
Guy Harris | 4560ac0527 | |
Gerald Combs | 077a9c9354 | |
Gerald Combs | 3fb8be3b91 | |
Gerald Combs | b2c58d020c | |
Guy Harris | 5e1db6219a | |
Chuck Craft | 418c3360bf | |
Gerald Combs | 24b27195f1 | |
Guy Harris | 66e6f092f9 | |
Guy Harris | 3213fb0a19 | |
Guy Harris | b88fcfafd7 | |
Jaap Keuter | db364ed3d5 | |
Guy Harris | 3a60e4992d | |
Gerald Combs | 21f9f3f1f2 | |
Constantine Gavrilov | 90ed3ff952 | |
Guy Harris | 108b84a591 | |
Guy Harris | 098fe77ec6 | |
Guy Harris | 089889acf2 | |
Guy Harris | ab6fb92ba3 | |
Guy Harris | 34dbb3bc32 | |
Guy Harris | 375f76bdeb | |
Guy Harris | ebb55c3c02 | |
Guy Harris | ebba9d3f45 | |
Gerald Combs | 653071f630 | |
Harald Welte | 5b97f29a9a | |
Jaap Keuter | d742da0e53 | |
Gerald Combs | e372771997 | |
João Valverde | 003a730a20 | |
Jaap Keuter | 49393cf362 | |
Dario Lombardo | 39da36ad6e | |
Gerald Combs | 564a52be19 | |
Gerald Combs | e0abfddcc5 | |
Gerald Combs | 6ae6cd335a | |
Gerald Combs | b442b8d9d1 | |
Gerald Combs | 57e14a4190 | |
John Thacker | 247f8a4b33 | |
Jaap Keuter | 935de5c4eb | |
Guy Harris | 1b22b8ed51 | |
Guy Harris | 9bcc1785c1 | |
Guy Harris | e072a71256 | |
Jaap Keuter | 303a7cc58f | |
Gerald Combs | e5478357e2 | |
Grzegorz Niemirowski | cbdee60912 | |
Gerald Combs | 24f56bec53 | |
Gerald Combs | 2248cba00c | |
Jim Young | 1b8d89accd | |
Enrique Giraldo | edaa78ceac | |
Jason Cohen | c8bc83cb9e | |
Jaap Keuter | 227ed8cced | |
Pascal Quantin | 4ea329548c | |
Pascal Quantin | 632df36405 | |
Guy Harris | 79b075365f | |
Guy Harris | 886465a976 | |
Guy Harris | 3ff5fc344f | |
Guy Harris | 22cc9f3f7f | |
Gerald Combs | f8d662d787 | |
Nardi Ivan | c297de3b27 | |
Gerald Combs | 48f42d78b1 | |
Dr. Lars Völker | f4d5d56592 | |
Pascal Quantin | 9fd813398f | |
Pascal Quantin | b7e7e0b37f | |
Pascal Quantin | c6c0556b3a | |
Dr. Lars Völker | 85320d2b80 | |
Uli Heilmeier | 75c00f6d0d | |
John Thacker | a666035948 | |
Gerald Combs | 0bb6c70189 | |
Eugene Adell | 39f15f4d3f | |
Dr. Lars Völker | d412877409 | |
John Thacker | 6f489ee857 | |
Stig Bjørlykke | ee43965024 | |
Orgad Shaneh | c57c306762 | |
Gerald Combs | 0b17762519 | |
Orgad Shaneh | e71ff74953 | |
Orgad Shaneh | 1d6e13c12e | |
Orgad Shaneh | 417b694990 | |
Stig Bjørlykke | 09d182d987 | |
Stig Bjørlykke | f95baf9c9c | |
Nardi Ivan | 17b2a16b5a | |
Jirka Novak | 4bbab577e7 | |
Jirka Novak | 0985a2ef2a | |
Valerii Zapodovnikov | 89f62ccec2 | |
Jaap Keuter | b67f9a2f26 | |
Gerald Combs | 92cea416e7 | |
Guy Harris | cbd1e0e040 | |
Guy Harris | c92409657d | |
Guy Harris | ac3579da34 | |
Guy Harris | 4ee9ca7681 | |
Moshe Kaplan | 8ea18fe50c | |
Jaap Keuter | 54ddb2e9f9 | |
Gerald Combs | ed87507e1a | |
Gerald Combs | 2bf67916e5 | |
Dario Lombardo | c3b3e09f94 | |
Gerald Combs | bab5339f3a | |
Guy Harris | d09878a74b | |
Gerald Combs | 498192a7b4 | |
Nardi Ivan | f209b56885 | |
Nardi Ivan | 2fa8940607 | |
Guy Harris | e898cf7257 | |
Guy Harris | 8ecb2b907f | |
Guy Harris | ba3e22673a | |
Guy Harris | 7e54366ef9 | |
Guy Harris | 5e31174b33 | |
Guy Harris | 566f03b3c3 | |
Guy Harris | 1aeaf65ea5 | |
Guy Harris | 303ee87fd2 | |
Guy Harris | dec868cb42 | |
Guy Harris | c98e80f365 | |
Guy Harris | 0717bf0a99 | |
John Thacker | 5c1c84f415 | |
Joerg Mayer | 6e6b4c9e7a | |
Jaap Keuter | af66bef360 | |
Dr. Lars Völker | 3b13b3051f | |
Guy Harris | d09e9fe0ea | |
Guy Harris | f647aebf86 | |
Guy Harris | ffb049f040 | |
Guy Harris | 10985f6e27 | |
Gerald Combs | 03ebce0c30 | |
Gerald Combs | a889cf1b1b | |
Nardi Ivan | 7ac76765fc | |
Gerald Combs | 2437f45a49 | |
Guy Harris | bd4259557b | |
Guy Harris | d1be8e80e2 | |
Guy Harris | e1535a9aa3 | |
Guy Harris | 7901947b11 | |
Guy Harris | 67f0d0ed73 | |
Gerald Combs | 6b950fe6f0 | |
Gerald Combs | 4a102163d0 | |
Guy Harris | 64578cba75 | |
Guy Harris | 9bb44ac156 | |
Jaap Keuter | 564ec58f6d | |
Jaap Keuter | e228784c4e | |
Nardi Ivan | a2ceb50866 | |
Gerald Combs | f53f5e64d5 | |
j.novak@netsystem.cz | c865975463 | |
Nardi Ivan | a16388824b | |
Andrii Vladyka | 4908474b1f | |
Pascal Quantin | b621801877 | |
Jaap Keuter | 747a03de06 | |
Gerald Combs | 862a55ae54 | |
Gerald Combs | bf311c44a5 | |
Pascal Quantin | 81bcbf0ed6 | |
Jaap Keuter | 18ada21232 | |
Pascal Quantin | 655cb724fd | |
Gerald Combs | 19cf6c5600 | |
Gerald Combs | 273eb0efcc | |
Gerald Combs | 1bf7c9a693 | |
Gerald Combs | 10a02a65d7 | |
Gerald Combs | 1a27f40587 | |
George Powers | 295d0a19fa | |
Gerald Combs | 01fb136ec9 | |
John Thacker | 181eb5cf82 | |
Yoshihiro Ueda | 9cee503a87 | |
Stig Bjørlykke | b668d0a9d5 | |
Stig Bjørlykke | d5ea403f8d | |
Stig Bjørlykke | 3cd179d007 | |
Uli Heilmeier | 41a97c978d | |
Gerald Combs | 1296e05a52 | |
Gerald Combs | 3501e40941 | |
Gerald Combs | fa02a5779f | |
Andrii Vladyka | e507bee854 | |
Guy Harris | d6be39038c | |
Andrii Vladyka | c3aef32766 | |
Guy Harris | 2491a8f7f3 | |
John Thacker | db14720d63 | |
Teyut | c2d9eb4cfd | |
Guy Harris | 787e19080e | |
Guy Harris | 1a79e899df | |
Nardi Ivan | d88fadf46d | |
Gerald Combs | fa53725469 | |
Gerald Combs | 5edf715c04 | |
Harald Welte | 970e9bfb2c | |
Orgad Shaneh | 29e59a0e20 | |
Guy Harris | 65c6d829db | |
Guy Harris | be38cd2edb | |
Gerald Combs | 3d62a28f06 | |
Guy Harris | 127f8e47ee | |
Guy Harris | d73b87e52a | |
Guy Harris | 2f391e81d6 | |
Dario Lombardo | 5a3c08e27f | |
Pascal Quantin | 4d2c7b9940 | |
Pascal Quantin | 095cb11a36 | |
Pascal Quantin | dcd7a99f1d | |
Uli Heilmeier | 8fdffc1113 | |
Pascal Quantin | 7097d817a2 | |
Nardi Ivan | 436cddcc84 | |
Gerald Combs | e3c543984d | |
Jaap Keuter | 5016b41e6a | |
Joakim Andersson | 233f80f21b | |
Guy Harris | 899899533c | |
John Thacker | 793142cbec | |
Jaap Keuter | dd88e7a90b | |
Jason Cohen | d304fa8431 | |
Gerald Combs | 96d5d2b091 | |
Gerald Combs | df635a196b | |
Guy Harris | f79f407cae | |
John Thacker | cd6afd7c9b | |
Pascal Quantin | a0ce8fa84d | |
Pascal Quantin | 5010face74 | |
Pascal Quantin | 7e94496598 | |
Alexis La Goutte | f7e8752d2f | |
Gerald Combs | 6ece1c896d | |
Gerald Combs | d88dc7f29a | |
Gerald Combs | c8fedf65b2 | |
Gerald Combs | 263d7a5272 | |
Pau Espin | 6891c21fe1 | |
Nardi Ivan | ba9ae589ad | |
Gerald Combs | 2714dd9e6f | |
Nardi Ivan | 6988aad8b6 | |
Gerald Combs | de66fa058f | |
Jaap Keuter | b387f0c4db | |
Jaap Keuter | 30ca9a975e | |
Pau Espin | a00ac1eb9c | |
Huang Qiangxiong | b97332b12e | |
John Thacker | 4e0dbcbc97 | |
Guy Harris | 99238a0198 | |
Alexis La Goutte | 5cac5d3254 | |
Gerald Combs | bc09f1a334 | |
Uli Heilmeier | b3de664f2b | |
Orgad Shaneh | 2533f666a9 | |
Dr. Lars Völker | 4d7b07dfe4 | |
Chuck Craft | 5497552ab1 | |
Uli Heilmeier | 15f52841ca | |
Gerald Combs | 746cf80cce | |
Nardi Ivan | daca140dfe | |
Nardi Ivan | b46c3e2537 | |
Sylvain Munaut | 78ac817a84 | |
Martin Mathieson | 006537ad22 | |
Gerald Combs | 26a0ee2c4b | |
Gerald Combs | 9733f173ea | |
Vadim Yanitskiy | 731f847342 | |
Jonas Falkevik | 34b41729f9 | |
Huang Qiangxiong | 1d6de11c49 | |
Gerald Combs | a1909f2343 | |
Gerald Combs | f49d6000a7 | |
Jaap Keuter | a4213f2c4f | |
Stig Bjørlykke | d28275c397 | |
Dieter Dobbelaere | 13d0b4e400 | |
Guy Harris | 928f32e85c | |
Guy Harris | 9837703a11 | |
Guy Harris | c53cbf81f4 | |
Stig Bjørlykke | ab41153f22 | |
Guy Harris | ce22707c35 | |
Guy Harris | b45aad9be2 | |
Guy Harris | 9b437e3c2d | |
Stig Bjørlykke | fe86435dd7 | |
Gerald Combs | 38207edc52 | |
Gerald Combs | 74eeba5787 | |
Jaap Keuter | f7a46fbed9 | |
Gerald Combs | 24450d9c51 | |
John Thacker | de81bd705a | |
Gerald Combs | d1865925ee | |
Gerald Combs | dfae8942af | |
Gerald Combs | eff9f0fb0d |
|
@ -20,7 +20,7 @@ jobs:
|
|||
- name: Install biplist
|
||||
run: pip install biplist
|
||||
- name: Set up Ruby 2.6
|
||||
uses: actions/setup-ruby@v1.1.1
|
||||
uses: actions/setup-ruby@v1.1.2
|
||||
with:
|
||||
ruby-version: '2.6'
|
||||
- name: Install deps
|
||||
|
|
|
@ -14,13 +14,14 @@ jobs:
|
|||
- name: Install winflexbison3
|
||||
run: cinst -y --force winflexbison3 --version 2.5.18.20190508
|
||||
- name: Install strawberryperl
|
||||
run: |
|
||||
choco install strawberryperl
|
||||
echo "##[add-path]C:\strawberry\c\bin;C:\strawberry\perl\site\bin;C:\strawberry\perl\bin"
|
||||
uses: shogo82148/actions-setup-perl@v1
|
||||
with:
|
||||
perl-version: '5.30'
|
||||
distribution: strawberry
|
||||
- name: Install Qt
|
||||
uses: jurplel/install-qt-action@v2
|
||||
- name: Add msbuild to PATH
|
||||
uses: microsoft/setup-msbuild@v1.0.0
|
||||
uses: microsoft/setup-msbuild@v1.0.2
|
||||
with:
|
||||
vs-version: 16.4
|
||||
- name: Set MSVC command prompt
|
||||
|
|
446
.gitlab-ci.yml
446
.gitlab-ci.yml
|
@ -1,34 +1,84 @@
|
|||
.build: &build
|
||||
# In the interest of reliability and performance, please avoid installing
|
||||
# external dependencies here, e.g. via tools/*-setup.sh, apt, dnf, or yum.
|
||||
# Do so in the appropriate Dockerfile at
|
||||
# https://gitlab.com/wireshark/wireshark-containers/ instead.
|
||||
# The resulting images can be found at
|
||||
# https://hub.docker.com/r/wireshark/wireshark-centos-7-dev
|
||||
# https://hub.docker.com/r/wireshark/wireshark-debian-stable-dev
|
||||
# https://hub.docker.com/r/wireshark/wireshark-fedora-dev
|
||||
# https://hub.docker.com/r/wireshark/wireshark-opensuse-15.1-dev
|
||||
# https://hub.docker.com/r/wireshark/wireshark-ubuntu-dev
|
||||
|
||||
stages:
|
||||
- build
|
||||
- test
|
||||
- fuzz-asan
|
||||
- fuzz-randpkt
|
||||
- fuzz-valgrind
|
||||
|
||||
variables:
|
||||
# Ensure that checkouts are a) fast and b) have a reachable tag. In a
|
||||
# brighter, more glorious future we might be able to use --shallow-since:
|
||||
# https://gitlab.com/gitlab-org/gitlab-runner/-/issues/3460
|
||||
# In the mean time, fetching the last 2000 commits does the job.
|
||||
GIT_DEPTH: "1"
|
||||
GIT_FETCH_EXTRA_FLAGS: "--depth=2000"
|
||||
CCACHE_DIR: "${CI_PROJECT_DIR}/ccache"
|
||||
CLANG_VERSION: 10
|
||||
|
||||
# Common rule stanzas
|
||||
# These must currently be including using "!reference tags". "extends:" and
|
||||
# YAML anchors won't work:
|
||||
# https://gitlab.com/gitlab-org/gitlab/-/issues/322992
|
||||
#
|
||||
# Commits that have been approved and merged. Run automatically in the main
|
||||
# repo and allow manual runs in the web UI and in forks.
|
||||
.if-merged:
|
||||
- if: '$CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_URL =~ /.*gitlab.com\/wireshark\/wireshark/'
|
||||
when: always
|
||||
- if: '$CI_PIPELINE_SOURCE == "web"'
|
||||
when: always
|
||||
- if: '$CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_URL !~ /.*gitlab.com\/wireshark\/wireshark/'
|
||||
when: manual
|
||||
# Incoming merge requests.
|
||||
.if-merge-request:
|
||||
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
|
||||
when: always
|
||||
# Incoming non-detached merge requests. Must be used for runners which are only
|
||||
# available in wireshark/wireshark, e.g. wireshark-windows-*
|
||||
.if-attached-merge-request:
|
||||
- if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_PROJECT_URL =~ /.*gitlab.com\/wireshark\/wireshark/'
|
||||
when: always
|
||||
# Fuzz jobs. Care should be taken when changing this since the scheduler
|
||||
# often doesn't report errors.
|
||||
.if-fuzz-schedule:
|
||||
- if: '$CI_PIPELINE_SOURCE == "schedule" && $SCHEDULE_TYPE == "fuzz"'
|
||||
when: always
|
||||
|
||||
.build:
|
||||
stage: build
|
||||
after_script:
|
||||
- for builddir in build/packaging/rpm/BUILD/wireshark-*/build build/packaging/rpm/BUILD/wireshark-* build obj-*; do [ ! -d "$builddir/run" ] || break; done
|
||||
- if [[ "$CI_JOB_NAME" == "build:rpm-opensuse-"* ]]; then export LD_LIBRARY_PATH=$builddir/run; fi
|
||||
- if [ -f $builddir/run/tshark ]; then $builddir/run/tshark --version; fi
|
||||
|
||||
# The custom Ubuntu image pre-installs dependencies and compilers to speed up the build:
|
||||
# https://hub.docker.com/r/wireshark/wireshark-ubuntu-dev
|
||||
# https://github.com/wireshark/wireshark-ubuntu-dev-docker
|
||||
.build-ubuntu: &build-ubuntu
|
||||
<<: *build
|
||||
.build-ubuntu:
|
||||
extends: .build
|
||||
image: wireshark/wireshark-ubuntu-dev
|
||||
retry: 1
|
||||
# https://gould.cx/ted/blog/2017/06/10/ccache-for-Gitlab-CI/
|
||||
cache:
|
||||
# XXX Use ${CI_JOB_NAME}-${CI_MERGE_REQUEST_TARGET_BRANCH_NAME} instead?
|
||||
key: ${CI_JOB_NAME}-master
|
||||
key: ${CI_JOB_NAME}-release-3.4
|
||||
paths:
|
||||
- ccache/
|
||||
before_script:
|
||||
- apt-get update -qq
|
||||
- ./tools/debian-setup.sh --install-optional --install-test-deps -y
|
||||
- useradd user
|
||||
- locale-gen en_US.UTF-8
|
||||
- export LANG=en_US.UTF-8
|
||||
- export PYTEST_ADDOPTS=--skip-missing-programs=dumpcap,rawshark
|
||||
- mkdir -p ccache
|
||||
- apt-get install -y ccache
|
||||
- export CCACHE_BASEDIR=${PWD}
|
||||
- export CCACHE_DIR=${PWD}/ccache
|
||||
- ccache --show-stats
|
||||
- export DEB_BUILD_OPTIONS=nocheck
|
||||
- export DH_QUIET=1
|
||||
|
@ -36,99 +86,114 @@
|
|||
- mkdir build
|
||||
- cd build
|
||||
script:
|
||||
- cmake -GNinja $CMAKE_ARGS ..
|
||||
# setcap restricts our library paths
|
||||
- CFLAGS=-Wl,-rpath=$(pwd)/run CXXFLAGS=-Wl,-rpath=$(pwd)/run cmake -GNinja -DENABLE_CCACHE=ON ..
|
||||
- ninja
|
||||
- ninja test-programs
|
||||
- chown -R user .
|
||||
- if [ -f run/dumpcap ]; then setcap cap_net_raw,cap_net_admin+eip run/dumpcap; fi
|
||||
- if [ -f run/dumpcap ]; then su user -c "run/dumpcap -D" ; fi
|
||||
- su user -c pytest-3
|
||||
|
||||
.build-rpm: &build-rpm
|
||||
<<: *build
|
||||
.build-rpm:
|
||||
extends: .build
|
||||
rules: !reference [.if-merged]
|
||||
artifacts:
|
||||
paths:
|
||||
- build/packaging/rpm/RPMS
|
||||
expire_in: 3 days
|
||||
|
||||
# Rely on fedora:latest and debian-stable jobs for testing a recent GCC version.
|
||||
clang-10: &clang-10
|
||||
<<: *build-ubuntu
|
||||
.test-rpm:
|
||||
rules: !reference [.if-merged]
|
||||
stage: test
|
||||
variables:
|
||||
CC: clang-10
|
||||
CXX: clang++-10
|
||||
GIT_STRATEGY: none
|
||||
|
||||
build:rpm-centos-7:
|
||||
<<: *build-rpm
|
||||
image: centos:7
|
||||
# Rely on fedora:latest and debian-stable jobs for testing a recent GCC version.
|
||||
Clang 10:
|
||||
extends: .build-ubuntu
|
||||
rules: !reference [.if-merged]
|
||||
variables:
|
||||
CC: "clang-$CLANG_VERSION"
|
||||
CXX: "clang++-$CLANG_VERSION"
|
||||
|
||||
Source Package:
|
||||
extends: .build-ubuntu
|
||||
rules: !reference [.if-merged]
|
||||
script:
|
||||
- perl ../tools/make-version.pl --set-release || ../perl make-version.pl --set-release
|
||||
- cmake -G Ninja $CMAKE_ARGS -DENABLE_CCACHE=ON ..
|
||||
- cd $CI_PROJECT_DIR
|
||||
- build/packaging/source/git-export-release.sh -d .
|
||||
after_script:
|
||||
# - ccache --max-size $( du --summarize --block-size=1M "$CI_PROJECT_DIR/build" | awk '{printf ("%dM", $1 * 1.5)}' )
|
||||
- for digest in sha256 rmd160 sha1 ; do openssl $digest wireshark-*.tar.* ; done
|
||||
# This will break if we produce multiple tarballs, which is arguably a good thing.
|
||||
- if [ -n "$AWS_ACCESS_KEY_ID" ] && [ -n "$AWS_SECRET_ACCESS_KEY" ] && [ -n "$S3_DESTINATION_DIST" ] ; then aws s3 cp wireshark-*.tar.* "$S3_DESTINATION_DIST/" ; fi
|
||||
artifacts:
|
||||
paths:
|
||||
- wireshark-*.tar.*
|
||||
|
||||
CentOS 7 RPM Package:
|
||||
extends: .build-rpm
|
||||
image: wireshark/wireshark-centos-7-dev
|
||||
script:
|
||||
- yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
|
||||
- tools/rpm-setup.sh --install-optional -y
|
||||
- mkdir build
|
||||
- cd build
|
||||
- cmake3 -GNinja ..
|
||||
- ninja-build rpm-package
|
||||
test:rpm-centos-7:
|
||||
stage: test
|
||||
image: centos:7
|
||||
CentOS 7 RPM Test:
|
||||
extends: .test-rpm
|
||||
image: wireshark/wireshark-centos-7-dev
|
||||
script:
|
||||
- yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
|
||||
- yum --nogpgcheck localinstall -y build/packaging/rpm/RPMS/x86_64/*.rpm
|
||||
- tshark --version
|
||||
dependencies:
|
||||
- build:rpm-centos-7
|
||||
variables:
|
||||
GIT_STRATEGY: none
|
||||
build:rpm-opensuse-15.1:
|
||||
image: opensuse/leap:15.1
|
||||
<<: *build-rpm
|
||||
dependencies: [ 'CentOS 7 RPM Package' ]
|
||||
|
||||
openSUSE 15.1 RPM Package:
|
||||
extends: .build-rpm
|
||||
image: wireshark/wireshark-opensuse-15.1-dev
|
||||
script:
|
||||
- zypper --non-interactive install update-desktop-files
|
||||
- tools/rpm-setup.sh --install-optional ruby
|
||||
- gem install asciidoctor -v 1.5.8 --no-ri --no-rdoc
|
||||
- mkdir build
|
||||
- cd build
|
||||
- cmake -GNinja ..
|
||||
- ninja rpm-package
|
||||
test:rpm-opensuse-15.1:
|
||||
image: opensuse/leap:15.1
|
||||
stage: test
|
||||
openSUSE 15.1 RPM Test:
|
||||
extends: .test-rpm
|
||||
image: wireshark/wireshark-opensuse-15.1-dev
|
||||
script:
|
||||
- zypper --no-gpg-checks install -y build/packaging/rpm/RPMS/x86_64/*.rpm
|
||||
- tshark --version
|
||||
variables:
|
||||
GIT_STRATEGY: none
|
||||
dependencies:
|
||||
- build:rpm-opensuse-15.1
|
||||
build:rpm-fedora:
|
||||
<<: *build-rpm
|
||||
image: fedora
|
||||
dependencies: [ 'openSUSE 15.1 RPM Package' ]
|
||||
|
||||
# Disabled for now due to issues with Fedora 33.
|
||||
.Fedora RPM Package:
|
||||
extends: .build-rpm
|
||||
image: wireshark/wireshark-fedora-dev
|
||||
script:
|
||||
- dnf upgrade -y
|
||||
- tools/rpm-setup.sh --install-optional -y
|
||||
- mkdir build
|
||||
- cd build
|
||||
- cmake3 -GNinja ..
|
||||
- ninja-build rpm-package
|
||||
test:rpm-fedora:
|
||||
image: fedora
|
||||
stage: test
|
||||
script:
|
||||
- dnf install -y build/packaging/rpm/RPMS/x86_64/*.rpm
|
||||
- tshark --version
|
||||
variables:
|
||||
GIT_STRATEGY: none
|
||||
dependencies:
|
||||
- build:rpm-fedora
|
||||
|
||||
# .Fedora RPM Test:
|
||||
# extends: .test-rpm
|
||||
# image: fedora
|
||||
# script:
|
||||
# - dnf install -y build/packaging/rpm/RPMS/x86_64/*.rpm
|
||||
# - tshark --version
|
||||
# dependencies: [ 'Fedora RPM Package' ]
|
||||
|
||||
# Job to generate packages for Debian stable
|
||||
build:debian-stable:
|
||||
<<: *build
|
||||
image: debian:stable
|
||||
before_script:
|
||||
- ./tools/debian-setup.sh --install-optional --install-test-deps -y --install-deb-deps
|
||||
Debian Stable APT Package:
|
||||
extends: .build
|
||||
rules: !reference [.if-merged]
|
||||
image: wireshark/wireshark-debian-stable-dev
|
||||
script:
|
||||
# Shared GitLab runners limit the log size to 4M, so reduce verbosity. See
|
||||
# https://gitlab.com/gitlab-com/support-forum/issues/2790
|
||||
- export DH_QUIET=1
|
||||
- export MAKEFLAGS=--silent
|
||||
- dpkg-buildpackage -b --no-sign -jauto
|
||||
- mkdir debian-packages
|
||||
- mv ../*.deb debian-packages/
|
||||
|
@ -136,30 +201,130 @@ build:debian-stable:
|
|||
paths:
|
||||
- debian-packages/*.deb
|
||||
expire_in: 3 days
|
||||
test:debian-stable:
|
||||
image: debian:stable
|
||||
Debian Stable APT Test:
|
||||
rules: !reference [.if-merged]
|
||||
image: wireshark/wireshark-debian-stable-dev
|
||||
stage: test
|
||||
script:
|
||||
- apt-get update
|
||||
- DEBIAN_FRONTEND=noninteractive apt-get install ./debian-packages/*.deb -y
|
||||
- tshark --version
|
||||
after_script:
|
||||
# Used for https://www.wireshark.org/docs/dfref/
|
||||
- TSHARK_VERSION=$( tshark --version | head -n 1 | sed -e 's/.*(v//' -e 's/)$//' )
|
||||
- tshark -G fields > dfilter-list-${TSHARK_VERSION}.txt
|
||||
artifacts:
|
||||
paths:
|
||||
- dfilter-list-*.txt
|
||||
variables:
|
||||
GIT_STRATEGY: none
|
||||
dependencies:
|
||||
- build:debian-stable
|
||||
dependencies: [ 'Debian Stable APT Package' ]
|
||||
|
||||
Win64 Package:
|
||||
stage: build
|
||||
rules: !reference [.if-merged]
|
||||
tags:
|
||||
- wireshark-win64-package
|
||||
before_script:
|
||||
- $env:WIRESHARK_BASE_DIR = "C:\Development"
|
||||
- $env:Configuration = "RelWithDebInfo"
|
||||
- $env:Path += ";C:\Program Files\CMake\bin"
|
||||
- $env:Path += ";C:\Strawberry\c\bin;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin"
|
||||
- $env:Path += ";C:\qt\5.15.2\msvc2019_64\bin"
|
||||
- $env:Path += ";C:\Program Files (x86)\NSIS"
|
||||
- $env:Path += ";C:\Program Files (x86)\WiX Toolset v3.11\bin"
|
||||
- $env:Path += ";C:\Program Files\Amazon\AWSCLIV2"
|
||||
# https://help.appveyor.com/discussions/questions/18777-how-to-use-vcvars64bat-from-powershell
|
||||
- cmd.exe /c "call `"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars64.bat`" && set > %temp%\vcvars.txt"
|
||||
- Get-Content "$env:temp\vcvars.txt" | Foreach-Object { if ($_ -match "^(.*?)=(.*)$") { Set-Content "env:\$($matches[1])" $matches[2] } }
|
||||
- mkdir build
|
||||
- cd build
|
||||
script:
|
||||
- perl ../tools/make-version.pl --set-release
|
||||
- cmake -G "Visual Studio 16 2019" -A x64 -DDISABLE_WERROR=OFF -DTEST_EXTRA_ARGS=--enable-release -DENABLE_LTO=off ..
|
||||
- msbuild /verbosity:minimal "/consoleloggerparameters:PerformanceSummary;NoSummary" /maxcpucount Wireshark.sln
|
||||
- msbuild /verbosity:minimal /maxcpucount test-programs.vcxproj
|
||||
- msbuild /verbosity:minimal /maxcpucount nsis_package_prep.vcxproj
|
||||
- msbuild /verbosity:minimal /maxcpucount wix_package_prep.vcxproj
|
||||
- C:\gitlab-builds\bin\sign-files.ps1 -Recurse -Path run\RelWithDebInfo
|
||||
- msbuild /verbosity:minimal nsis_package.vcxproj
|
||||
- C:\gitlab-builds\bin\sign-files.ps1 -Path packaging\nsis
|
||||
- msbuild /verbosity:minimal wix_package.vcxproj
|
||||
- C:\gitlab-builds\bin\sign-files.ps1 -Path packaging\wix
|
||||
- $plugins = Get-ChildItem run\RelWithDebInfo\plugins\*\*.dll ; signtool verify /v /pa /all run\RelWithDebInfo\*.exe run\RelWithDebInfo\extcap\*.exe $plugins run\RelWithDebInfo\libwireshark.dll run\RelWithDebInfo\libwiretap.dll run\RelWithDebInfo\libwsutil.dll packaging\nsis\Wireshark-win??-*.exe packaging\wix\Wireshark-win??-*.msi
|
||||
- msbuild /verbosity:minimal pdb_zip_package.vcxproj
|
||||
- C:\gitlab-builds\bin\mse-scan.ps1
|
||||
- $packages = Get-ChildItem "packaging\nsis\Wireshark-win??-*.exe", "packaging\wix\Wireshark-win??-*.msi"
|
||||
- foreach ($package in $packages) { certutil -hashfile $package SHA256 }
|
||||
- |
|
||||
if ((Test-Path env:AWS_ACCESS_KEY_ID) -and (Test-Path env:AWS_SECRET_ACCESS_KEY) -and (Test-Path env:S3_DESTINATION_WIN64)) {
|
||||
foreach ($package in $packages) {
|
||||
aws s3 cp "$package" "$env:S3_DESTINATION_WIN64/"
|
||||
}
|
||||
}
|
||||
- ctest -C RelWithDebInfo --parallel 3 --force-new-ctest-process --verbose
|
||||
|
||||
Win32 Package:
|
||||
stage: build
|
||||
rules: !reference [.if-merged]
|
||||
tags:
|
||||
- wireshark-win32-package
|
||||
before_script:
|
||||
- $env:WIRESHARK_BASE_DIR = "C:\Development"
|
||||
- $env:Configuration = "RelWithDebInfo"
|
||||
- $env:Path += ";C:\Program Files\CMake\bin"
|
||||
- $env:Path += ";C:\Strawberry\c\bin;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin"
|
||||
- $env:Path += ";C:\qt\5.15.2\msvc2019\bin"
|
||||
- $env:Path += ";C:\Program Files (x86)\NSIS"
|
||||
- $env:Path += ";C:\Program Files (x86)\WiX Toolset v3.11\bin"
|
||||
- $env:Path += ";C:\Program Files\Amazon\AWSCLIV2"
|
||||
# https://help.appveyor.com/discussions/questions/18777-how-to-use-vcvars64bat-from-powershell
|
||||
- cmd.exe /c "call `"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsamd64_x86.bat`" && set > %temp%\vcvars.txt"
|
||||
- Get-Content "$env:temp\vcvars.txt" | Foreach-Object { if ($_ -match "^(.*?)=(.*)$") { Set-Content "env:\$($matches[1])" $matches[2] } }
|
||||
- $env:Platform = "Win32"
|
||||
- mkdir build
|
||||
- cd build
|
||||
script:
|
||||
- perl ../tools/make-version.pl --set-release
|
||||
- cmake -G "Visual Studio 16 2019" -A Win32 -DDISABLE_WERROR=OFF -DTEST_EXTRA_ARGS=--enable-release -DENABLE_LTO=off ..
|
||||
- msbuild /verbosity:minimal "/consoleloggerparameters:PerformanceSummary;NoSummary" /maxcpucount Wireshark.sln
|
||||
- msbuild /verbosity:minimal /maxcpucount test-programs.vcxproj
|
||||
- msbuild /verbosity:minimal /maxcpucount nsis_package_prep.vcxproj
|
||||
- msbuild /verbosity:minimal /maxcpucount wix_package_prep.vcxproj
|
||||
- C:\gitlab-builds\bin\sign-files.ps1 -Recurse -Path run\RelWithDebInfo
|
||||
- msbuild /verbosity:minimal nsis_package.vcxproj
|
||||
- C:\gitlab-builds\bin\sign-files.ps1 -Path packaging\nsis
|
||||
- msbuild /verbosity:minimal wix_package.vcxproj
|
||||
- C:\gitlab-builds\bin\sign-files.ps1 -Path packaging\wix
|
||||
- msbuild /verbosity:minimal portableapps_package.vcxproj
|
||||
- C:\gitlab-builds\bin\sign-files.ps1 -Path packaging\portableapps
|
||||
- $plugins = Get-ChildItem run\RelWithDebInfo\plugins\*\*.dll ; signtool verify /v /pa /all run\RelWithDebInfo\*.exe run\RelWithDebInfo\extcap\*.exe $plugins run\RelWithDebInfo\libwireshark.dll run\RelWithDebInfo\libwiretap.dll run\RelWithDebInfo\libwsutil.dll packaging\nsis\Wireshark-win??-*.exe packaging\wix\Wireshark-win??-*.msi packaging\portableapps\WiresharkPortable_*.paf.exe
|
||||
- msbuild /verbosity:minimal pdb_zip_package.vcxproj
|
||||
- C:\gitlab-builds\bin\mse-scan.ps1
|
||||
- $packages = Get-ChildItem "packaging\nsis\Wireshark-win??-*.exe", "packaging\wix\Wireshark-win??-*.msi", "packaging\portableapps\WiresharkPortable_*.paf.exe"
|
||||
- foreach ($package in $packages) { certutil -hashfile $package SHA256 }
|
||||
- |
|
||||
if ((Test-Path env:AWS_ACCESS_KEY_ID) -and (Test-Path env:AWS_SECRET_ACCESS_KEY) -and (Test-Path env:S3_DESTINATION_WIN32)) {
|
||||
foreach ($package in $packages) {
|
||||
aws s3 cp "$package" "$env:S3_DESTINATION_WIN32/"
|
||||
}
|
||||
}
|
||||
- ctest -C RelWithDebInfo --parallel 3 --force-new-ctest-process --verbose
|
||||
|
||||
# Build Wireshark manuals
|
||||
# Note: Need ubuntu:focal with `ruby-coderay` and `ruby-asciidoctor-pdf` packages to build PDF docs
|
||||
docbook:
|
||||
Documentation:
|
||||
stage: build
|
||||
image: wireshark/wireshark-ubuntu-dev
|
||||
rules:
|
||||
- changes:
|
||||
- "docbook/**"
|
||||
- "epan/wslua/**"
|
||||
before_script:
|
||||
- DEBIAN_FRONTEND="noninteractive" ./tools/debian-setup.sh --install-optional -y g++
|
||||
- if: '$CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_URL =~ /.*gitlab.com\/wireshark\/wireshark/'
|
||||
changes:
|
||||
- "docbook/**"
|
||||
- "epan/wslua/**"
|
||||
when: always
|
||||
script:
|
||||
# XXX We might want to move this to wireshark-ubuntu-dev or debian-setup.sh.
|
||||
- DEBIAN_FRONTEND=noninteractive apt-get update
|
||||
- DEBIAN_FRONTEND=noninteractive apt-get --yes install ruby-coderay ruby-asciidoctor-pdf
|
||||
- mkdir build
|
||||
- cd build
|
||||
- cmake -GNinja ..
|
||||
|
@ -178,37 +343,33 @@ docbook:
|
|||
|
||||
# https://docs.gitlab.com/ee/user/gitlab_com/index.html#linux-shared-runners
|
||||
|
||||
merge-req:commit-checks:
|
||||
<<: *build-ubuntu
|
||||
Commit Checks:
|
||||
extends: .build-ubuntu
|
||||
rules: !reference [.if-merge-request]
|
||||
tags:
|
||||
- docker
|
||||
rules:
|
||||
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
|
||||
script:
|
||||
# build-ubuntu puts us in `build`.
|
||||
- cd ..
|
||||
- bash ./tools/pre-commit 'HEAD^1'
|
||||
- tools/validate-commit.py
|
||||
|
||||
merge-req:ubuntu-dpkg:
|
||||
<<: *build-ubuntu
|
||||
Ubuntu .dpkg:
|
||||
extends: .build-ubuntu
|
||||
rules: !reference [.if-merge-request]
|
||||
tags:
|
||||
- docker
|
||||
rules:
|
||||
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
|
||||
script:
|
||||
- apt-get install -y lintian
|
||||
# build-ubuntu puts us in `build`.
|
||||
- cd ..
|
||||
- CC=/usr/lib/ccache/gcc CXX=/usr/lib/ccache/g++ dpkg-buildpackage -us -uc -rfakeroot -jauto -Zgzip -zfast
|
||||
- lintian --suppress-tags library-not-linked-against-libc --display-experimental --display-info --pedantic --profile debian
|
||||
- lintian --suppress-tags library-not-linked-against-libc,copyright-excludes-files-in-native-package --display-experimental --display-info --pedantic --profile debian
|
||||
|
||||
merge-req:ubuntu-gcc-ctest:
|
||||
<<: *build-ubuntu
|
||||
GCC Warnings:
|
||||
extends: .build-ubuntu
|
||||
rules: !reference [.if-merge-request]
|
||||
tags:
|
||||
- docker
|
||||
rules:
|
||||
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
|
||||
script:
|
||||
# build-ubuntu puts us in `build`.
|
||||
- perl ../tools/make-version.pl --set-release || ../perl make-version.pl --set-release
|
||||
|
@ -218,14 +379,15 @@ merge-req:ubuntu-gcc-ctest:
|
|||
- chown -R user .
|
||||
- su user -c "ctest --parallel 3 --force-new-ctest-process --verbose"
|
||||
|
||||
merge-req:ubuntu-clang-other-tests:
|
||||
extends: clang-10
|
||||
Code Checks + Clang Warnings:
|
||||
extends: .build-ubuntu
|
||||
rules: !reference [.if-merge-request]
|
||||
tags:
|
||||
- docker
|
||||
rules:
|
||||
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
|
||||
variables:
|
||||
CC: clang-$CLANG_VERSION
|
||||
CXX: clang++-$CLANG_VERSION
|
||||
script:
|
||||
- apt-get install -y cppcheck clang-tools python-pygments
|
||||
# build-ubuntu puts us in `build`.
|
||||
- cd ..
|
||||
- python3 tools/checklicenses.py
|
||||
|
@ -240,20 +402,18 @@ merge-req:ubuntu-clang-other-tests:
|
|||
artifacts:
|
||||
paths:
|
||||
- cppcheck_report.xml
|
||||
- cppcheck_report.html
|
||||
- cppcheck_report.html
|
||||
|
||||
# XXX This is still beta:
|
||||
# https://docs.gitlab.com/ee/user/gitlab_com/index.html#windows-shared-runners-beta
|
||||
# Dockerfile at https://github.com/wireshark/wireshark-windows-dev-docker.
|
||||
# XXX We currently depend on Qt being installed in C:\Qt on the host. We should
|
||||
# find a more independent way of installing Qt, e.g. via a download+cache.
|
||||
merge-req:windows:
|
||||
Windows Build:
|
||||
rules: !reference [.if-attached-merge-request]
|
||||
tags:
|
||||
- wireshark-windows-dev
|
||||
- wireshark-windows-merge-req
|
||||
stage: build
|
||||
rules:
|
||||
# The Windows Docker image is currently only available via a dedicated runner.
|
||||
- if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_PROJECT_URL == "https://gitlab.com/wireshark/wireshark"'
|
||||
before_script:
|
||||
# XXX Find a better location.
|
||||
- mkdir c:\Development
|
||||
|
@ -261,7 +421,7 @@ merge-req:windows:
|
|||
- $env:Configuration = "RelWithDebInfo"
|
||||
- $env:Path += ";C:\Program Files\CMake\bin"
|
||||
- $env:Path += ";C:\Strawberry\c\bin;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin"
|
||||
- $env:Path += ";C:\qt\5.15.1\msvc2019_64\bin"
|
||||
- $env:Path += ";C:\qt\5.15.2\msvc2019_64\bin"
|
||||
# https://help.appveyor.com/discussions/questions/18777-how-to-use-vcvars64bat-from-powershell
|
||||
- cmd.exe /c "call `"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat`" && set > %temp%\vcvars.txt"
|
||||
- Get-Content "$env:temp\vcvars.txt" | Foreach-Object { if ($_ -match "^(.*?)=(.*)$") { Set-Content "env:\$($matches[1])" $matches[2] } }
|
||||
|
@ -279,3 +439,85 @@ merge-req:windows:
|
|||
- msbuild "/consoleloggerparameters:PerformanceSummary;NoSummary" /maxcpucount Wireshark.sln
|
||||
- msbuild "/consoleloggerparameters:PerformanceSummary;NoSummary" test-programs.vcxproj
|
||||
- ctest -C RelWithDebInfo --parallel 3 --force-new-ctest-process --verbose
|
||||
|
||||
# Fuzz TShark using ASAN and valgrind.
|
||||
.fuzz-ubuntu:
|
||||
extends: .build-ubuntu
|
||||
rules: !reference [.if-fuzz-schedule]
|
||||
tags:
|
||||
- wireshark-ubuntu-fuzz
|
||||
resource_group: fuzz-release-3.4
|
||||
variables:
|
||||
CC: "clang-$CLANG_VERSION"
|
||||
CXX: "clang++-$CLANG_VERSION"
|
||||
INSTALL_PREFIX: "$CI_PROJECT_DIR/_install"
|
||||
MIN_PLUGINS: 10
|
||||
MAX_PASSES: 15
|
||||
before_script:
|
||||
- mkdir -p ccache
|
||||
# Signal after_script, which runs in its own shell.
|
||||
- echo "export FUZZ_PASSED=true" > /tmp/fuzz_result.sh
|
||||
- mkdir /tmp/fuzz
|
||||
- mkdir build
|
||||
- cd build
|
||||
after_script:
|
||||
- . /tmp/fuzz_result.sh
|
||||
- if $FUZZ_PASSED ; then exit 0 ; fi
|
||||
- echo Fuzzing failed. Generating report.
|
||||
- FUZZ_CAPTURE=$( ls /tmp/fuzz/fuzz-*.pcap | head -n 1 )
|
||||
- FUZZ_ERRORS="/tmp/fuzz/$( basename "$FUZZ_CAPTURE" .pcap ).err"
|
||||
- printf "\nfuzz-test.sh stderr:\n" >> "$FUZZ_ERRORS"
|
||||
- cat fuzz-test.err >> "$FUZZ_ERRORS"
|
||||
- |
|
||||
if [ -n "$AWS_ACCESS_KEY_ID" ] && [ -n "$AWS_SECRET_ACCESS_KEY" ] && [ -n "$S3_DESTINATION_FUZZ" ] ; then
|
||||
aws s3 cp "$FUZZ_CAPTURE" "$S3_DESTINATION_FUZZ/"
|
||||
aws s3 cp "$FUZZ_ERRORS" "$S3_DESTINATION_FUZZ/"
|
||||
fi
|
||||
# The cache should be large enough to be useful but it shouldn't take
|
||||
# too long to restore+save each run.
|
||||
- ccache --max-size $( du --summarize --block-size=1M "$CI_PROJECT_DIR/build" | awk '{printf ("%dM", $1 * 1.5)}' )
|
||||
|
||||
ASan Menagerie Fuzz:
|
||||
extends: .fuzz-ubuntu
|
||||
stage: fuzz-asan
|
||||
script:
|
||||
- MAX_SECONDS=$(( 4 * 60 * 60 ))
|
||||
- printf "\e[0Ksection_start:%s:cmake_section[collapsed=true]\r\e[0KRunning CMake" "$( date +%s)"
|
||||
- cmake -G Ninja -DBUILD_wireshark=OFF -DCMAKE_BUILD_TYPE=Debug -DENABLE_ASAN=ON -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX -DENABLE_CCACHE=ON ..
|
||||
- printf "\e[0Ksection_end:%s:cmake_section\r\e[0K" "$( date +%s)"
|
||||
- ninja
|
||||
- ninja install
|
||||
- cd ..
|
||||
# /var/menagerie contains captures harvested from wireshark.org's mailing list, wiki, issues, etc.
|
||||
# We have more captures than we can fuzz in $MAX_SECONDS, so we shuffle them each run.
|
||||
- ./tools/fuzz-test.sh -a -2 -P $MIN_PLUGINS -b $INSTALL_PREFIX/bin -d /tmp/fuzz -t $MAX_SECONDS $( shuf -e /var/menagerie/*/* ) 2> fuzz-test.err || echo "export FUZZ_PASSED=false" > /tmp/fuzz_result.sh
|
||||
|
||||
ASan randpkt Fuzz:
|
||||
extends: .fuzz-ubuntu
|
||||
stage: fuzz-randpkt
|
||||
script:
|
||||
# XXX Reuse fuzz-asan?
|
||||
- printf "\e[0Ksection_start:%s:cmake_section[collapsed=true]\r\e[0KRunning CMake" "$( date +%s)"
|
||||
- cmake -G Ninja -DBUILD_wireshark=OFF -DCMAKE_BUILD_TYPE=Debug -DENABLE_ASAN=ON -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX -DENABLE_CCACHE=ON ..
|
||||
- printf "\e[0Ksection_end:%s:cmake_section\r\e[0K" "$( date +%s)"
|
||||
- ninja
|
||||
- ninja install
|
||||
- cd ..
|
||||
- ./tools/randpkt-test.sh -a -b $INSTALL_PREFIX/bin -d /tmp/fuzz -p $MAX_PASSES 2> fuzz-test.err || echo "export FUZZ_PASSED=false" > /tmp/fuzz_result.sh
|
||||
needs: [ 'ASan Menagerie Fuzz' ]
|
||||
|
||||
Valgrind Menagerie Fuzz:
|
||||
extends: .fuzz-ubuntu
|
||||
stage: fuzz-valgrind
|
||||
script:
|
||||
- DEBIAN_FRONTEND=noninteractive apt-get update
|
||||
- DEBIAN_FRONTEND=noninteractive apt-get --yes install valgrind
|
||||
- MAX_SECONDS=$(( 3 * 60 * 60 ))
|
||||
- printf "\e[0Ksection_start:%s:cmake_section[collapsed=true]\r\e[0KRunning CMake" "$( date +%s)"
|
||||
- cmake -G Ninja -DBUILD_wireshark=OFF -DCMAKE_BUILD_TYPE=Debug -DENABLE_ASAN=OFF -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX -DENABLE_CCACHE=ON ..
|
||||
- printf "\e[0Ksection_end:%s:cmake_section\r\e[0K" "$( date +%s)"
|
||||
- ninja
|
||||
- ninja install
|
||||
- cd ..
|
||||
- ./tools/fuzz-test.sh -g -P $MIN_PLUGINS -b $INSTALL_PREFIX/bin -d /tmp/fuzz -t $MAX_SECONDS $( shuf -e /var/menagerie/*/* ) 2> fuzz-test.err || echo "export FUZZ_PASSED=false" > /tmp/fuzz_result.sh
|
||||
needs: [ 'ASan randpkt Fuzz' ]
|
||||
|
|
2
.mailmap
2
.mailmap
|
@ -102,7 +102,7 @@ Jeff Oconnell <jeffo@rulez.com> jeff oconnell <jeffo@rulez.com>
|
|||
Jeroen Sack <jeroen@jeroensack.nl> Jeroen Sack <jsack@lely.com>
|
||||
Jim Schaettle <jimschaettle@gmail.com> Nick <jimschaettle@gmail.com>
|
||||
Jiří Engelthaler <engycz@gmail.com> Jiri Engelthaler <engycz@gmail.com>
|
||||
João Valverde <joao.valverde@tecnico.ulisboa.pt> João Valverde <j@v6e.pt>
|
||||
João Valverde <j@v6e.pt> João Valverde <joao.valverde@tecnico.ulisboa.pt>
|
||||
Joeri de Ruiter <joeri@cypherpunk.nl> Joeri <joeri@cypherpunk.nl>
|
||||
John Miner <optommp@gmail.com> John <optommp@gmail.com>
|
||||
Jonathan Fleming <jonathan@optigo.net> Jonathan Fleming <jonathanfleming135@gmail.com>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
[main]
|
||||
host = https://www.transifex.com
|
||||
|
||||
[wireshark.master]
|
||||
[wireshark.qt-34]
|
||||
file_filter = ui/qt/wireshark_<lang>.ts
|
||||
source_file = ui/qt/wireshark_en.ts
|
||||
source_lang = en
|
||||
|
@ -17,7 +17,7 @@ trans.uk = ui/qt/wireshark_uk.ts
|
|||
trans.zh_CN = ui/qt/wireshark_zh_CN.ts
|
||||
type = QT
|
||||
|
||||
[wireshark.debian]
|
||||
[wireshark.po-34]
|
||||
file_filter = debian/po/<lang>.po
|
||||
source_file = debian/po/templates.pot
|
||||
source_lang = en
|
||||
|
|
22
AUTHORS
22
AUTHORS
|
@ -3979,10 +3979,10 @@ Pavel Moravec <pmoravec[AT]redhat.com>
|
|||
Robert Long <rlong[AT]sandia.gov>
|
||||
James Lynch <lynch007[AT]gmail.com>
|
||||
Chidambaram Arunachalam <carunach[AT]cisco.com>
|
||||
João Valverde <joao.valverde[AT]tecnico.ulisboa.pt>
|
||||
João Valverde <j[AT]v6e.pt>
|
||||
Benoît Canet <benoit[AT]scylladb.com>
|
||||
Håkon Øye Amundsen <haakon.amundsen[AT]nordicsemi.no>
|
||||
Jeffrey Wildman <jeffrey.wildman@ll.mit.edu>
|
||||
Jeffrey Wildman <jeffrey.wildman[AT]ll.mit.edu>
|
||||
|
||||
|
||||
= From git log =
|
||||
|
@ -4130,6 +4130,7 @@ Christian Kreibich <christian[AT]corelight.com>
|
|||
Christian Krump <christian.krump[AT]br-automation.com>
|
||||
Christian Lamparter <chunkeey[AT]googlemail.com>
|
||||
Christian M. Amsüss <chrysn[AT]fsfe.org>
|
||||
Christian Reusch <creusch[AT]crnetpackets.com>
|
||||
Christian Tellefsen <chris-git[AT]tellefsen.net>
|
||||
Christian Ullrich <chris[AT]chrullrich.net>
|
||||
Christoph Burger-Scheidlin <mail[AT]christoph.burger-scheidlin.name>
|
||||
|
@ -4146,9 +4147,11 @@ Chuck Lever <chuck.lever[AT]oracle.com>
|
|||
Chugzilla <chugzilla77[AT]gmail.com>
|
||||
Chun-Yeow Yeoh <yeohchunyeow[AT]gmail.com>
|
||||
Claudius Zingerli <czingerl[AT]gmail.com>
|
||||
Clément Notin <clement.notin[AT]gmail.com>
|
||||
Cody Doucette <doucette[AT]bu.edu>
|
||||
Colin Foster <colin.foster[AT]in-advantage.com>
|
||||
Colin Sames <sames.colin[AT]gmail.com>
|
||||
Constantine Gavrilov <constg[AT]il.ibm.com>
|
||||
Craig Jackson <cejackson51[AT]gmail.com>
|
||||
Cédric Delmas <cedricde[AT]outlook.fr>
|
||||
D. W. Poon <dwpoon[AT]mail.ubc.ca>
|
||||
|
@ -4184,6 +4187,7 @@ David Kreitschmann <dkreitschmann[AT]seemoo.tu-darmstadt.de>
|
|||
David McKay <mckay.david[AT]gmail.com>
|
||||
David Morsberger <dave[AT]morsberger.com>
|
||||
David Perry <boolean263[AT]protonmail.com>
|
||||
David Perry <d.perry[AT]utoronto.ca>
|
||||
David Snowdon <daves[AT]metamako.com>
|
||||
David Tapuska <dave[AT]tapuska.com>
|
||||
David Zoller <zollerd[AT]gmail.com>
|
||||
|
@ -4202,6 +4206,7 @@ DiablosOffens <DiablosOffens[AT]gmx.de>
|
|||
Didier Arenzana <darenzana[AT]yahoo.fr>
|
||||
Didier Barvaux <didier.barvaux[AT]toulouse.viveris.com>
|
||||
Diederik de Groot <ddegroot[AT]talon.nl>
|
||||
Dieter Dobbelaere <dieter.dobbelaere[AT]excentis.com>
|
||||
Dirk Eibach <dirk.eibach[AT]gdsys.cc>
|
||||
Dirk Römmen <dirk.roemmen[AT]cslab.de>
|
||||
Dirk Weise <code[AT]dirk-weise.de>
|
||||
|
@ -4275,6 +4280,7 @@ Gene Cumm <gene.cumm[AT]gmail.com>
|
|||
Georg Brandl <georg[AT]python.org>
|
||||
Georg Richter <georg[AT]mariadb.org>
|
||||
George Hopkins <george-hopkins[AT]null.net>
|
||||
George Powers <gpowers[AT]google.com>
|
||||
Gerard Garcia <ggarcia[AT]deic.uab.cat>
|
||||
Gergely Nagy <ngg[AT]ngg.hu>
|
||||
Gerhard KHUENY <Gerhard.KHUENY[AT]bachmann.info>
|
||||
|
@ -4290,6 +4296,7 @@ Gregor Beck <gbeck[AT]sernet.de>
|
|||
Gregor Jasny <gjasny[AT]googlemail.com>
|
||||
Gregor Jasny <gregor.jasny[AT]logmein.com>
|
||||
Gregor Miernik <gregor.miernik[AT]hytec.de>
|
||||
Grzegorz Niemirowski <grzegorz[AT]grzegorz.net>
|
||||
Guillaume Autran <gautran[AT]clearpathrobotics.com>
|
||||
Guy Davies <aguydavies[AT]gmail.com>
|
||||
Guy Harris <gharris[AT]sonic.net>
|
||||
|
@ -4450,6 +4457,7 @@ Lichen Liu <llc123456a[AT]gmail.com>
|
|||
Lin Sun <lin.sun[AT]zoom.us>
|
||||
Loganaden Velvindron <logan[AT]cyberstorm.mu>
|
||||
Lorenzo Vannucci <vannucci[AT]ntop.org>
|
||||
Loris Degioanni <loris[AT]sysdig.com>
|
||||
Lotte Steenbrink <lotte[AT]zombietetris.de>
|
||||
Luca Melette <luca[AT]srlabs.de>
|
||||
Lucas Simopoulos <lsimopoulos[AT]gmail.com>
|
||||
|
@ -4495,6 +4503,7 @@ Martin Heusse <martin.heusse[AT]imag.fr>
|
|||
Martin Mathieson <martin.mathieson[AT]keysight.com>
|
||||
Martin Sehnoutka <msehnout[AT]redhat.com>
|
||||
Martin Tibenský <martin.tibensky[AT]alcatel-lucent.com>
|
||||
Martin Tschoepe <martin.tschoepe[AT]web.de>
|
||||
Martin Vit <martin[AT]voipmonitor.org>
|
||||
Masashi Honma <masashi.honma[AT]gmail.com>
|
||||
Matej Košík <5764c029b688c1c0d24a2e97cd764f[AT]gmail.com>
|
||||
|
@ -4723,6 +4732,7 @@ Signat Sibirskiy <ord.blant[AT]gmail.com>
|
|||
Silvio Gissi <silvio.gissi[AT]gmail.com>
|
||||
Simon Barber <simon.barber[AT]meraki.net>
|
||||
Simon Graham <simgrxp[AT]gmail.com>
|
||||
Simon Holesch <simon[AT]holesch.de>
|
||||
Simon Long <hobei[AT]whitedoor.plus.com>
|
||||
Simon Vans-Colina <simon[AT]monzo.com>
|
||||
Simon Zhong <szhong.jnpr[AT]gmail.com>
|
||||
|
@ -4758,10 +4768,12 @@ Taisuke Sasaki <taisasak[AT]cisco.com>
|
|||
Tamir Duberstein <tamird[AT]google.com>
|
||||
Tatsuhiro Tsujikawa <tatsuhiro.t[AT]gmail.com>
|
||||
Tengfei Chang <tengfei.chang[AT]inria.fr>
|
||||
Teyut <teyut[AT]free.fr>
|
||||
Thibault Gerondal <github[AT]tycale.be>
|
||||
Thies Moeller <thies.moeller[AT]baslerweb.com>
|
||||
Thiyagarajan P <psvthiyagarajan[AT]gmail.com>
|
||||
Thomas Chen <funorpain[AT]gmail.com>
|
||||
Thomas Dreibholz <dreibh[AT]simula.no>
|
||||
Thomas Klausner <tk[AT]giga.or.at>
|
||||
Thomas Portassau <thomas.portassau[AT]hotmail.fr>
|
||||
Thomas Shen <thomashen[AT]gmail.com>
|
||||
|
@ -4799,8 +4811,10 @@ Uwe Kleine-König <uwe[AT]kleine-koenig.org>
|
|||
Vadim Fedorenko <vadimjunk[AT]gmail.com>
|
||||
Vadim Yanitskiy <axilirator[AT]gmail.com>
|
||||
Vadim Yanitskiy <vyanitskiy[AT]sysmocom.de>
|
||||
Vahap Emin Agaogullari <vahapemin44[AT]gmail.com>
|
||||
ValdikSS <iam[AT]valdikss.org.ru>
|
||||
Valentin Vidic <Valentin.Vidic[AT]CARNet.hr>
|
||||
Valerii Zapodovnikov <val.zapod.vz[AT]gmail.com>
|
||||
Vanson Lim <vlim[AT]cisco.com>
|
||||
Vasil Velichkov <vvvelichkov[AT]gmail.com>
|
||||
Victor Barratault <victor.barratault[AT]gmail.com>
|
||||
|
@ -4844,6 +4858,7 @@ Yann Pomarède <yann.pomarede[AT]gmail.com>
|
|||
Yannik Enss <Yannik.Enss[AT]rohde-schwarz.com>
|
||||
Yasuyuki Tanaka <yasuyuki.tanaka[AT]inria.fr>
|
||||
Yehonatan Zecharia <yonti95[AT]gmail.com>
|
||||
Yoshihiro Ueda <uyoshihiro[AT]users.noreply.gitlab.com>
|
||||
Yoshiyuki Kurauchi <ahochauwaaaaa[AT]gmail.com>
|
||||
Yuri Chislov <yuri.chislov[AT]gmail.com>
|
||||
Yurii Lysyi <yurii.lysyi[AT]ericsson.com>
|
||||
|
@ -4852,6 +4867,7 @@ Zachary Holcomb <zholcomb2017[AT]my.fit.edu>
|
|||
Zdeněk Žamberský <zzdevel[AT]seznam.cz>
|
||||
Zhao Lin <zlbinghamton[AT]gmail.com>
|
||||
Zhenhua Hu <fattiger1102[AT]gmail.com>
|
||||
ZhongYao Luo <LuoZhongYao[AT]gmail.com>
|
||||
akuchekar <akuchekar[AT]empirix.com>
|
||||
anonsvn <anonsvn[AT]localhost>
|
||||
atul358 <atul358[AT]gmail.com>
|
||||
|
@ -4865,12 +4881,12 @@ kardam <netkardam[AT]gmail.com>
|
|||
kkoizumi <kkoizumi46[AT]gmail.com>
|
||||
liningjie <1350445139[AT]qq.com>
|
||||
mkg20001 <mkg20001[AT]gmail.com>
|
||||
naf <naf[AT]sdf.org>
|
||||
nickvsnetworking <nick[AT]nickvsnetworking.com>
|
||||
pegah hajiani <pegah_haj[AT]yahoo.com>
|
||||
rbroker <rstbroker[AT]gmail.com>
|
||||
shqking <shqking[AT]gmail.com>
|
||||
subhav8 <subhadevi88[AT]gmail.com>
|
||||
vahapemin <vahapemin44[AT]gmail.com>
|
||||
zhongweisitu <zsitu[AT]extremenetworks.com>
|
||||
zhudewen <zhudewen[AT]iauto.com>
|
||||
Émilio Gonzalez <egg997[AT]gmail.com>
|
||||
|
|
|
@ -3979,10 +3979,10 @@ Pavel Moravec <pmoravec[AT]redhat.com>
|
|||
Robert Long <rlong[AT]sandia.gov>
|
||||
James Lynch <lynch007[AT]gmail.com>
|
||||
Chidambaram Arunachalam <carunach[AT]cisco.com>
|
||||
João Valverde <joao.valverde[AT]tecnico.ulisboa.pt>
|
||||
João Valverde <j[AT]v6e.pt>
|
||||
Benoît Canet <benoit[AT]scylladb.com>
|
||||
Håkon Øye Amundsen <haakon.amundsen[AT]nordicsemi.no>
|
||||
Jeffrey Wildman <jeffrey.wildman@ll.mit.edu>
|
||||
Jeffrey Wildman <jeffrey.wildman[AT]ll.mit.edu>
|
||||
|
||||
= Acknowledgements =
|
||||
|
||||
|
|
151
CMakeLists.txt
151
CMakeLists.txt
|
@ -34,8 +34,8 @@ project(${_project_name} C CXX)
|
|||
# Updated by tools/make-version.pl
|
||||
set(GIT_REVISION 0)
|
||||
set(PROJECT_MAJOR_VERSION 3)
|
||||
set(PROJECT_MINOR_VERSION 3)
|
||||
set(PROJECT_PATCH_VERSION 2)
|
||||
set(PROJECT_MINOR_VERSION 4)
|
||||
set(PROJECT_PATCH_VERSION 7)
|
||||
set(PROJECT_BUILD_VERSION ${GIT_REVISION})
|
||||
set(PROJECT_VERSION_EXTENSION "")
|
||||
|
||||
|
@ -117,7 +117,7 @@ if(WIN32)
|
|||
file( TO_CMAKE_PATH "$ENV{WIRESHARK_LIB_DIR}" _PROJECT_LIB_DIR )
|
||||
elseif( DEFINED ENV{WIRESHARK_BASE_DIR} )
|
||||
file( TO_CMAKE_PATH "$ENV{WIRESHARK_BASE_DIR}" _WS_BASE_DIR )
|
||||
set( _PROJECT_LIB_DIR "${_WS_BASE_DIR}/wireshark-${WIRESHARK_TARGET_PLATFORM}-libs" )
|
||||
set( _PROJECT_LIB_DIR "${_WS_BASE_DIR}/wireshark-${WIRESHARK_TARGET_PLATFORM}-libs-3.4" )
|
||||
else()
|
||||
# Don't know what to do
|
||||
message(FATAL_ERROR "Neither WIRESHARK_BASE_DIR or WIRESHARK_LIB_DIR are defined")
|
||||
|
@ -261,11 +261,43 @@ if(WIN32)
|
|||
set(WILDCARD_OBJ wsetargv.obj)
|
||||
endif(WIN32)
|
||||
|
||||
include(CheckSymbolExists)
|
||||
|
||||
#
|
||||
# Large file support on UN*X, a/k/a LFS.
|
||||
#
|
||||
# On Windows, we require _fseeki64() and _ftelli64(). Visual
|
||||
# Studio has had supported them since Visual Studio 2005/MSVCR80,
|
||||
# and we require newer versions, so we know we have them.
|
||||
#
|
||||
if(NOT WIN32)
|
||||
include(FindLFS)
|
||||
if(LFS_FOUND)
|
||||
#
|
||||
# Add the required #defines.
|
||||
#
|
||||
add_definitions(${LFS_DEFINITIONS})
|
||||
endif()
|
||||
|
||||
#
|
||||
# Check for fseeko as well.
|
||||
#
|
||||
include(FindFseeko)
|
||||
if(FSEEKO_FOUND)
|
||||
set(HAVE_FSEEKO ON)
|
||||
|
||||
#
|
||||
# Add the required #defines.
|
||||
#
|
||||
add_definitions(${FSEEKO_DEFINITIONS})
|
||||
endif()
|
||||
endif()
|
||||
|
||||
# Banner shown at top right of Qt welcome screen.
|
||||
if(DEFINED ENV{WIRESHARK_VERSION_FLAVOR})
|
||||
set(VERSION_FLAVOR "$ENV{WIRESHARK_VERSION_FLAVOR}")
|
||||
else()
|
||||
set(VERSION_FLAVOR "Development Build")
|
||||
#else()
|
||||
# set(VERSION_FLAVOR "Development Build")
|
||||
endif()
|
||||
|
||||
# These are required in .rc files and manifests
|
||||
|
@ -456,16 +488,15 @@ if( CMAKE_C_COMPILER_ID MATCHES "MSVC")
|
|||
|
||||
else() # ! MSVC
|
||||
if(APPLE)
|
||||
set(MIN_MACOS_VERSION 10.6) # Arbitrary.
|
||||
# MIN_MACOS_VERSION is used to set LSMinimumSystemVersion
|
||||
# in Info.plist, so start with something low.
|
||||
set(MIN_MACOS_VERSION 10.6)
|
||||
if(CMAKE_OSX_DEPLOYMENT_TARGET)
|
||||
if(CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS MIN_MACOS_VERSION)
|
||||
message(FATAL_ERROR "We don't support building for macOS < ${MIN_MACOS_VERSION}")
|
||||
endif()
|
||||
set(MIN_MACOS_VERSION ${CMAKE_OSX_DEPLOYMENT_TARGET})
|
||||
message(STATUS "Building for Mac OS X/OS X/macOS ${CMAKE_OSX_DEPLOYMENT_TARGET}")
|
||||
endif()
|
||||
elseif(CMAKE_OSX_DEPLOYMENT_TARGET)
|
||||
message(FATAL_ERROR "CMAKE_OSX_DEPLOYMENT_TARGET only applies when building for macOS")
|
||||
endif()
|
||||
|
||||
#
|
||||
|
@ -1199,6 +1230,14 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
|||
find_package(SETCAP)
|
||||
endif()
|
||||
|
||||
if(ENABLE_AMRNB)
|
||||
set(PACKAGELIST ${PACKAGELIST} AMRNB)
|
||||
endif()
|
||||
|
||||
if(ENABLE_LIBXML2)
|
||||
set(PACKAGELIST ${PACKAGELIST} LibXml2)
|
||||
endif()
|
||||
|
||||
# Include minizip include directories
|
||||
if(MINIZIP_FOUND)
|
||||
include_directories(
|
||||
|
@ -1237,12 +1276,11 @@ add_custom_target(dist
|
|||
)
|
||||
|
||||
if(GNUTLS_FOUND AND NOT GNUTLS_VERSION VERSION_LESS "3.4.0")
|
||||
# While all Linux and Windows builds have PKCS #11 support enabled,
|
||||
# macos-setup.sh explicitly disables it using --without-p11-kit.
|
||||
# Calculating public keys from PKCS #11 private keys requires GnuTLS
|
||||
# 3.4.0 or greater.
|
||||
#
|
||||
# Require at least GnuTLS 3.4.0 such that public keys can be calculated
|
||||
# from PKCS #11 private keys.
|
||||
include(CheckSymbolExists)
|
||||
# Check that the support is present in case GnuTLS was compiled
|
||||
# --without-p11-kit as macos-setup.sh did until recently.
|
||||
cmake_push_check_state()
|
||||
if(WIN32)
|
||||
set(CMAKE_REQUIRED_DEFINITIONS -Dssize_t=int)
|
||||
|
@ -1253,6 +1291,65 @@ if(GNUTLS_FOUND AND NOT GNUTLS_VERSION VERSION_LESS "3.4.0")
|
|||
cmake_pop_check_state()
|
||||
endif()
|
||||
|
||||
if(HAVE_LIBAIRPCAP)
|
||||
set(HAVE_AIRPCAP 1)
|
||||
endif()
|
||||
if(HAVE_LIBLUA)
|
||||
set(HAVE_LUA_H 1)
|
||||
set(HAVE_LUA 1)
|
||||
endif()
|
||||
if(HAVE_LIBKERBEROS)
|
||||
set(HAVE_KERBEROS 1)
|
||||
endif()
|
||||
if(MAXMINDDB_FOUND)
|
||||
set(HAVE_MAXMINDDB 1)
|
||||
endif()
|
||||
if(LIBSSH_FOUND)
|
||||
set(HAVE_LIBSSH 1)
|
||||
endif()
|
||||
if(JSONGLIB_FOUND)
|
||||
set(HAVE_JSONGLIB 1)
|
||||
endif()
|
||||
if(NGHTTP2_FOUND)
|
||||
set(HAVE_NGHTTP2 1)
|
||||
endif()
|
||||
if(HAVE_LIBCARES)
|
||||
set(HAVE_C_ARES 1)
|
||||
endif()
|
||||
if(NOT HAVE_LIBCARES)
|
||||
message(WARNING "Not using c-ares.")
|
||||
message(WARNING "DNS name resolution for captures will be disabled.")
|
||||
endif()
|
||||
if(HAVE_LIBNL AND HAVE_AIRPCAP)
|
||||
message(ERROR "Airpcap and Libnl support are mutually exclusive")
|
||||
endif()
|
||||
if(HAVE_LIBSBC)
|
||||
set(HAVE_SBC 1)
|
||||
endif()
|
||||
if(SPANDSP_FOUND)
|
||||
set(HAVE_SPANDSP 1)
|
||||
endif()
|
||||
if(BCG729_FOUND)
|
||||
set(HAVE_BCG729 1)
|
||||
endif()
|
||||
if(AMRNB_FOUND)
|
||||
set(HAVE_AMRNB 1)
|
||||
endif()
|
||||
if(LIBXML2_FOUND)
|
||||
set(HAVE_LIBXML2 1)
|
||||
else()
|
||||
# The (official) FindLibXml2.cmake file sets this cache variable to a
|
||||
# non-empty value, be sure to clear it when not found.
|
||||
set(LIBXML2_LIBRARIES "")
|
||||
endif()
|
||||
if(EXTCAP_ANDROIDDUMP_LIBPCAP)
|
||||
set(ANDROIDDUMP_USE_LIBPCAP 1)
|
||||
endif()
|
||||
|
||||
if (HAVE_LIBWINSPARKLE)
|
||||
set(HAVE_SOFTWARE_UPDATE 1)
|
||||
endif()
|
||||
|
||||
if (QT_FOUND)
|
||||
if (Qt5Widgets_VERSION VERSION_LESS 5.3)
|
||||
message(FATAL_ERROR "Qt 5.3 or later is required.")
|
||||
|
@ -1298,8 +1395,12 @@ if (QT_FOUND)
|
|||
)
|
||||
# https://doc.qt.io/qt-5/supported-platforms.html
|
||||
# https://doc.qt.io/qt-5.11/supported-platforms-and-configurations.html
|
||||
# https://doc.qt.io/qt-5.15/supported-platforms.html
|
||||
# https://doc-snapshots.qt.io/qt6-dev/supported-platforms.html
|
||||
# CMake < 3.7 doesn't support VERSION_GREATER_EQUAL.
|
||||
if(Qt5Widgets_VERSION VERSION_GREATER "5.14.999")
|
||||
if(Qt5Widgets_VERSION VERSION_GREATER "5.999.999")
|
||||
set(MIN_MACOS_VERSION 10.14)
|
||||
elseif(Qt5Widgets_VERSION VERSION_GREATER "5.14.999")
|
||||
set(MIN_MACOS_VERSION 10.13)
|
||||
elseif(Qt5Widgets_VERSION VERSION_GREATER "5.11.999")
|
||||
set(MIN_MACOS_VERSION 10.12)
|
||||
|
@ -1343,6 +1444,8 @@ if(APPLE)
|
|||
FIND_LIBRARY (APPLE_APPKIT_LIBRARY AppKit)
|
||||
FIND_LIBRARY (APPLE_CORE_FOUNDATION_LIBRARY CoreFoundation)
|
||||
FIND_LIBRARY (APPLE_SYSTEM_CONFIGURATION_LIBRARY SystemConfiguration)
|
||||
|
||||
message(STATUS "Building for Mac OS X/OS X/macOS ${MIN_MACOS_VERSION} using SDK ${CMAKE_OSX_SYSROOT}")
|
||||
endif()
|
||||
|
||||
include(ConfigureChecks.cmake)
|
||||
|
@ -1537,10 +1640,6 @@ foreach(_plugin_src_dir ${PLUGIN_SRC_DIRS})
|
|||
add_subdirectory( ${_plugin_src_dir} )
|
||||
endforeach()
|
||||
|
||||
# Large file support (e.g. make off_t 64 bit if supported)
|
||||
include(gmxTestLargeFiles)
|
||||
gmx_test_large_files(GMX_LARGEFILES)
|
||||
|
||||
set( VERSION ${PROJECT_VERSION} )
|
||||
if(VCSVERSION_OVERRIDE)
|
||||
# Allow distributors to override detection of the Git tag and version.
|
||||
|
@ -1625,6 +1724,11 @@ set_package_properties(OPUS PROPERTIES
|
|||
URL "https://opus-codec.org/"
|
||||
PURPOSE "Support for opus codec in RTP player"
|
||||
)
|
||||
set_package_properties(AMRNB PROPERTIES
|
||||
DESCRIPTION "AMRNB decoder"
|
||||
URL "https://sourceforge.net/p/opencore-amr"
|
||||
PURPOSE "Support for AMRNB codec in RTP player"
|
||||
)
|
||||
set_package_properties(LIBXML2 PROPERTIES
|
||||
DESCRIPTION "XML parsing library"
|
||||
URL "http://xmlsoft.org/"
|
||||
|
@ -1922,6 +2026,9 @@ if(WIN32)
|
|||
if (OPUS_FOUND)
|
||||
list (APPEND OPTIONAL_DLLS "${OPUS_DLL_DIR}/${OPUS_DLL}")
|
||||
endif(OPUS_FOUND)
|
||||
if (AMRNB_FOUND)
|
||||
list (APPEND OPTIONAL_DLLS "${AMRNB_DLL_DIR}/${AMRNB_DLL}")
|
||||
endif(AMRNB_FOUND)
|
||||
if (LIBXML2_FOUND)
|
||||
foreach( _dll ${LIBXML2_DLLS} )
|
||||
list (APPEND OPTIONAL_DLLS "${LIBXML2_DLL_DIR}/${_dll}")
|
||||
|
@ -2349,6 +2456,9 @@ if(BUILD_wireshark AND QT_FOUND)
|
|||
LINK_FLAGS "${WS_LINK_FLAGS}"
|
||||
FOLDER "Executables"
|
||||
INSTALL_RPATH "${EXECUTABLE_INSTALL_RPATH}"
|
||||
AUTOMOC ON
|
||||
AUTOUIC ON
|
||||
AUTORCC ON
|
||||
)
|
||||
if(ENABLE_APPLICATION_BUNDLE OR WIN32)
|
||||
set_target_properties(wireshark PROPERTIES OUTPUT_NAME Wireshark)
|
||||
|
@ -3057,6 +3167,9 @@ if(RPMBUILD_EXECUTABLE)
|
|||
if (OPUS_FOUND)
|
||||
list(APPEND _rpmbuild_with_args --with opus)
|
||||
endif()
|
||||
if (AMRNB_FOUND)
|
||||
list(APPEND _rpmbuild_with_args --with amrnb)
|
||||
endif()
|
||||
if (LIBXML2_FOUND)
|
||||
list(APPEND _rpmbuild_with_args --with libxml2)
|
||||
endif()
|
||||
|
|
|
@ -37,7 +37,7 @@ else()
|
|||
endif()
|
||||
option(BUILD_mmdbresolve "Build MaxMind DB resolver" ON)
|
||||
|
||||
option(DISABLE_WERROR "Do not treat warnings as errors" OFF)
|
||||
option(DISABLE_WERROR "Do not treat warnings as errors" ON)
|
||||
option(DISABLE_FRAME_LARGER_THAN_WARNING "Disable warning if the size of a function frame is large" OFF)
|
||||
option(EXTCAP_ANDROIDDUMP_LIBPCAP "Build androiddump using libpcap" OFF)
|
||||
option(ENABLE_EXTRA_COMPILER_WARNINGS "Do additional compiler warnings (disables -Werror)" OFF)
|
||||
|
@ -98,6 +98,7 @@ option(ENABLE_SBC "Build with SBC Codec support in RTP Player" ON)
|
|||
option(ENABLE_SPANDSP "Build with G.722/G.726 codecs support in RTP Player" ON)
|
||||
option(ENABLE_BCG729 "Build with G.729 codec support in RTP Player" ON)
|
||||
option(ENABLE_ILBC "Build with iLBC codec support in RTP Player" ON)
|
||||
option(ENABLE_AMRNB "Build with AMRNB codec support in RTP Player" ON)
|
||||
option(ENABLE_LIBXML2 "Build with libxml2 support" ON)
|
||||
option(ENABLE_OPUS "Build with opus support" ON)
|
||||
|
||||
|
|
|
@ -94,6 +94,19 @@ set(CMAKE_REQUIRED_LIBRARIES ${M_LIBRARIES})
|
|||
check_symbol_exists("floorl" "math.h" HAVE_FLOORL)
|
||||
cmake_pop_check_state()
|
||||
|
||||
#
|
||||
# Check whether we have clock_gettime().
|
||||
# It's not on Windows, so don't waste time checking for it.
|
||||
# It's in newer POSIX, so some, but not all, UN*Xes have it.
|
||||
#
|
||||
if (NOT WIN32)
|
||||
#
|
||||
# POSIX - don't bother checking on Windows, as checks
|
||||
# take time.
|
||||
#
|
||||
check_function_exists("clock_gettime" HAVE_CLOCK_GETTIME)
|
||||
endif (NOT WIN32)
|
||||
|
||||
check_function_exists("getopt_long" HAVE_GETOPT_LONG)
|
||||
if(HAVE_GETOPT_LONG)
|
||||
#
|
||||
|
|
135
NEWS
135
NEWS
|
@ -1,7 +1,4 @@
|
|||
Wireshark 3.3.2 Release Notes
|
||||
|
||||
This is an experimental release intended to test new features for
|
||||
Wireshark 3.4.
|
||||
Wireshark 3.4.7 Release Notes
|
||||
|
||||
What is Wireshark?
|
||||
|
||||
|
@ -10,94 +7,38 @@ Wireshark 3.3.2 Release Notes
|
|||
|
||||
What’s New
|
||||
|
||||
Many improvements have been made. See the “New and Updated Features”
|
||||
section below for more details.
|
||||
Bug Fixes
|
||||
|
||||
The following vulnerabilities have been fixed:
|
||||
|
||||
• wnpa-sec-2021-06[1] DNP dissector crash. Issue 17462[2].
|
||||
CVE-2021-22235[3].
|
||||
|
||||
The following bugs have been fixed:
|
||||
|
||||
• TCP dissector - Erroneous DSACK reporting Issue 17315[4].
|
||||
|
||||
• No wlan_radio.duration calculated for PHY type: 802.11ac (VHT)
|
||||
Issue 17419[5].
|
||||
|
||||
• NAN Dissector has wrong minimum length for availability attribute
|
||||
Issue 17431[6].
|
||||
|
||||
New and Updated Features
|
||||
|
||||
The following features are new (or have been significantly updated)
|
||||
since version 3.3.1:
|
||||
|
||||
• Nothing of note.
|
||||
|
||||
The following features are new (or have been significantly updated)
|
||||
since version 3.3.0:
|
||||
|
||||
• The Windows installers now ship with Npcap 1.00. They previously
|
||||
shipped with Npcap 0.9997.
|
||||
|
||||
• The Windows installers now ship with Qt 5.15.1. They previously
|
||||
shipped with Qt 5.12.8.
|
||||
|
||||
The following features are new (or have been significantly updated)
|
||||
since version 3.2.0:
|
||||
|
||||
• Windows executables and installers are now signed using SHA-2
|
||||
only[1].
|
||||
|
||||
• Save RTP stream to .au supports any codec with 8000 Hz rate
|
||||
supported by Wireshark (shown in RTP player). If save of audio is
|
||||
not possible (unsupported codec or rate), silence of same length
|
||||
is saved and warning is shown.
|
||||
|
||||
• Asynchronous DNS resolution is always enabled. As a result, the
|
||||
c-ares library is now a required dependency.
|
||||
|
||||
• Protobuf fields can be dissected as Wireshark (header) fields
|
||||
that allows user input the full names of Protobuf fields or
|
||||
messages in Filter toolbar for searching.
|
||||
|
||||
• Dissectors based on Protobuf can register themselves to a new
|
||||
'protobuf_field' dissector table, which is keyed with the full
|
||||
names of fields, for further parsing fields of BYTES or STRING
|
||||
type.
|
||||
|
||||
• Wireshark is able to decode, play, and save iLBC payload on
|
||||
platforms where the iLBC library[2] is available.
|
||||
|
||||
• Wireshark is able to decode, play, and save opus payload on
|
||||
platforms where the opus library[3] is available.
|
||||
|
||||
• “Decode As” entries can now be copied from other profiles using a
|
||||
button in the dialog.
|
||||
|
||||
• sshdump can now be copied to multiple instances. Each instance
|
||||
will show up a different interface and will have its own profile.
|
||||
|
||||
• The main window now supports a packet diagram view, which shows
|
||||
each packet as a textbook-style diagram.
|
||||
|
||||
• Filter buttons (“Preferences → Filter Buttons”) can be grouped by
|
||||
using “//” as a path separator in the filter button label.
|
||||
|
||||
• IPP Over USB packets can now be dissected and displayed
|
||||
|
||||
New Protocol Support
|
||||
|
||||
Arinc 615A (A615A), Asphodel Protocol, AudioCodes Debug Recording
|
||||
(ACDR), Bluetooth HCI ISO (BT HCI ISO), Cisco MisCabling Protocol
|
||||
(MCP), Community ID Flow Hashing (CommunityID), DCE/RPC
|
||||
IRemoteWinspool SubSystem, (IREMOTEWINSPOOL), Dynamic Link Exchange
|
||||
Protocol (DLEP), EAP Generalized Pre-Shared Key (EAP-GPSK), EAP
|
||||
Password Authenticated Exchange (EAP-PAX), EAP Pre-Shared Key
|
||||
(EAP-PSK), EAP Shared-secret Authentication and Key Establishment
|
||||
(EAP-SAKE), Fortinet Single Sign-on (FSSO), FTDI Multi-Protocol
|
||||
Synchronous Serial Engine (FTDI MPSSE), Hypertext Transfer Protocol
|
||||
Version 3 (HTTP3), ILDA Digital Network (IDN), ILDA Digital Network
|
||||
(IDN), Java Debug Wire Protocol (JDWP), LBM Stateful Resolution
|
||||
Service (LBMSRS), Lithionics Battery Management, OBSAI UDP-based
|
||||
Communication Protocol (UDPCP), Palo Alto Heartbeat Backup
|
||||
(PA-HB-Bak), ScyllaDB RPC, Technically Enhanced Capture Module
|
||||
Protocol (TECMP), Tunnel Extensible Authentication Protocol (TEAP),
|
||||
UDP based FTP w/ multicast V5 (UFTP5), and USB Printer (USBPRINTER)
|
||||
There are no new protocols in this release.
|
||||
|
||||
Updated Protocol Support
|
||||
|
||||
Too many protocols have been updated to list here.
|
||||
ASTERIX, BT LE LL, DCE RPC, DNP, GTPv2, IEEE 802.11 Radio, LDAP, NAN,
|
||||
NORDIC_BLE, NR RRC, OSPF, pcapng, PNIO, RSL, S101, Snort config, and
|
||||
TCP
|
||||
|
||||
New and Updated Capture File Support
|
||||
|
||||
MP4 (ISO/IEC 14496-12)
|
||||
Catapult DCT2000, ERF, and pcap
|
||||
|
||||
Getting Wireshark
|
||||
|
||||
|
@ -109,7 +50,7 @@ Wireshark 3.3.2 Release Notes
|
|||
Most Linux and Unix vendors supply their own Wireshark packages. You
|
||||
can usually install or upgrade Wireshark using the package management
|
||||
system specific to that platform. A list of third-party packages can
|
||||
be found on the download page[4] on the Wireshark web site.
|
||||
be found on the download page[7] on the Wireshark web site.
|
||||
|
||||
File Locations
|
||||
|
||||
|
@ -123,26 +64,28 @@ Wireshark 3.3.2 Release Notes
|
|||
The User’s Guide, manual pages and various other documentation can be
|
||||
found at https://www.wireshark.org/docs/
|
||||
|
||||
Community support is available on Wireshark’sQ&A site[5] and on the
|
||||
Community support is available on Wireshark’s Q&A site[8] and on the
|
||||
wireshark-users mailing list. Subscription information and archives
|
||||
for all of Wireshark’s mailing lists can be found on the web site[6].
|
||||
for all of Wireshark’s mailing lists can be found on the web site[9].
|
||||
|
||||
Bugs and feature requests can be reported on the issue tracker[7].
|
||||
Issues and feature requests can be reported on the issue tracker[10].
|
||||
|
||||
Frequently Asked Questions
|
||||
|
||||
A complete FAQ is available on the Wireshark web site[8].
|
||||
A complete FAQ is available on the Wireshark web site[11].
|
||||
|
||||
Last updated 2020-10-18 09:04:19 UTC
|
||||
Last updated 2021-07-14 16:36:15 UTC
|
||||
|
||||
References
|
||||
|
||||
1. https://support.microsoft.com/en-us/help/4472027/2019-sha-2-code-s
|
||||
igning-support-requirement-for-windows-and-wsus
|
||||
2. https://github.com/TimothyGu/libilbc
|
||||
3. https://opus-codec.org/
|
||||
4. https://www.wireshark.org/download.html#thirdparty
|
||||
5. https://ask.wireshark.org/
|
||||
6. https://www.wireshark.org/lists/
|
||||
7. https://gitlab.com/wireshark/wireshark/-/issues
|
||||
8. https://www.wireshark.org/faq.html
|
||||
1. https://www.wireshark.org/security/wnpa-sec-2021-06
|
||||
2. https://gitlab.com/wireshark/wireshark/-/issues/17462
|
||||
3. https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-22235
|
||||
4. https://gitlab.com/wireshark/wireshark/-/issues/17315
|
||||
5. https://gitlab.com/wireshark/wireshark/-/issues/17419
|
||||
6. https://gitlab.com/wireshark/wireshark/-/issues/17431
|
||||
7. https://www.wireshark.org/download.html#thirdparty
|
||||
8. https://ask.wireshark.org/
|
||||
9. https://www.wireshark.org/lists/
|
||||
10. https://gitlab.com/wireshark/wireshark/-/issues
|
||||
11. https://www.wireshark.org/faq.html
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
This branch contains Osmocom specific patches, see:
|
||||
https://osmocom.org/issues/2537
|
|
@ -11,10 +11,6 @@
|
|||
#ifndef __CAPCHILD_CAPTURE_SESSION_H__
|
||||
#define __CAPCHILD_CAPTURE_SESSION_H__
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#ifndef _WIN32
|
||||
#include <sys/types.h>
|
||||
#include <stdint.h>
|
||||
|
@ -24,6 +20,12 @@ extern "C" {
|
|||
|
||||
#include <wsutil/processes.h>
|
||||
|
||||
#include "cfile.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#ifdef HAVE_LIBPCAP
|
||||
/* Current state of capture engine. XXX - differentiate states */
|
||||
typedef enum {
|
||||
|
@ -32,7 +34,6 @@ typedef enum {
|
|||
CAPTURE_RUNNING /**< capture child signalled ok, capture is running now */
|
||||
} capture_state;
|
||||
|
||||
#include "cfile.h"
|
||||
struct _info_data;
|
||||
|
||||
/*
|
||||
|
|
|
@ -994,7 +994,7 @@ capture_opts_print_if_capabilities(if_capabilities_t *caps, char *name, int quer
|
|||
if (queries & CAPS_QUERY_LINK_TYPES) {
|
||||
if (caps->can_set_rfmon)
|
||||
printf("Data link types of interface %s when %sin monitor mode (use option -y to set):\n",
|
||||
name, queries & CAPS_MONITOR_MODE ? "" : "not ");
|
||||
name, (queries & CAPS_MONITOR_MODE) ? "" : "not ");
|
||||
else
|
||||
printf("Data link types of interface %s (use option -y to set):\n", name);
|
||||
for (lt_entry = caps->data_link_types; lt_entry != NULL;
|
||||
|
|
|
@ -11,16 +11,19 @@
|
|||
#ifndef __CAPTURE_PCAP_UTIL_H__
|
||||
#define __CAPTURE_PCAP_UTIL_H__
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#ifdef HAVE_LIBPCAP
|
||||
|
||||
#include "wspcap.h"
|
||||
|
||||
#include "capture_opts.h"
|
||||
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#ifdef HAVE_LIBPCAP
|
||||
/*
|
||||
* A snapshot length of 0 is useless - and libpcap/WinPcap/Npcap don't guarantee
|
||||
* that a snapshot length of 0 will work, and, on some platforms, it won't
|
||||
|
|
|
@ -11,12 +11,12 @@
|
|||
#ifndef __CAPTURE_IFINFO_H__
|
||||
#define __CAPTURE_IFINFO_H__
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
/*
|
||||
* Explicitly set the interface_type enum values as these values are exposed
|
||||
* in the preferences gui.interfaces_hidden_types string.
|
||||
|
|
|
@ -11,12 +11,12 @@
|
|||
#ifndef __WS80211_UTILS_H__
|
||||
#define __WS80211_UTILS_H__
|
||||
|
||||
#include "ws_attributes.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#include "ws_attributes.h"
|
||||
|
||||
enum ws80211_channel_type {
|
||||
WS80211_CHAN_NO_HT,
|
||||
WS80211_CHAN_HT20,
|
||||
|
|
|
@ -1,24 +0,0 @@
|
|||
/*
|
||||
* This code was copied from http://www.gromacs.org/
|
||||
* and its toplevel COPYING file starts with:
|
||||
*
|
||||
* GROMACS is free software, distributed under the GNU General Public License
|
||||
* (GPL) Version 2.
|
||||
*/
|
||||
|
||||
#include <sys/types.h>
|
||||
|
||||
/* detect failure even with -Wno-error on command line */
|
||||
#pragma GCC diagnostic error "-Werror"
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
/* Cause a compile-time error if off_t is smaller than 64 bits */
|
||||
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
|
||||
int off_t_is_large[ (LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1 ];
|
||||
/* silence unused errors */
|
||||
(void)off_t_is_large;
|
||||
(void)argc;
|
||||
(void)argv;
|
||||
return 0;
|
||||
}
|
|
@ -1,40 +0,0 @@
|
|||
/*
|
||||
* and its toplevel COPYING file starts with:
|
||||
*
|
||||
* GROMACS is free software, distributed under the GNU General Public License
|
||||
* (GPL) Version 2.
|
||||
*/
|
||||
|
||||
#cmakedefine _LARGEFILE_SOURCE
|
||||
#cmakedefine _LARGEFILE64_SOURCE
|
||||
#cmakedefine _LARGE_FILES
|
||||
#cmakedefine _FILE_OFFSET_BITS @_FILE_OFFSET_BITS@
|
||||
|
||||
/* detect failure even with -Wno-error on command line */
|
||||
#pragma GCC diagnostic error "-Werror"
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
/* Cause a compile-time error if off_t is smaller than 64 bits,
|
||||
* and make sure we have ftello / fseeko.
|
||||
*/
|
||||
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
|
||||
int off_t_is_large[ (LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1 ];
|
||||
/* silence unused warnings */
|
||||
FILE *fp;
|
||||
off_t offset;
|
||||
(void)off_t_is_large;
|
||||
(void)argc;
|
||||
(void)argv;
|
||||
fp = fopen(argv[0],"r");
|
||||
offset = ftello( fp );
|
||||
|
||||
fseeko( fp, offset, SEEK_CUR );
|
||||
fclose(fp);
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -0,0 +1,57 @@
|
|||
# Find the system's opencore-amrnb includes and library
|
||||
#
|
||||
# AMRNB_INCLUDE_DIRS - where to find amrnb/decoder.h
|
||||
# AMRNB_LIBRARIES - List of libraries when using amrnb
|
||||
# AMRNB_FOUND - True if amrnb found
|
||||
# AMRNB_DLL_DIR - (Windows) Path to the amrnb DLL
|
||||
# AMRNB_DLL - (Windows) Name of the amrnb DLL
|
||||
|
||||
include( FindWSWinLibs )
|
||||
FindWSWinLibs( "opencore-amrnb-.*" "AMRNB_HINTS" )
|
||||
|
||||
if (NOT WIN32)
|
||||
find_package(PkgConfig)
|
||||
pkg_search_module(AMRNB opencore-amrnb)
|
||||
endif()
|
||||
|
||||
find_path( AMRNB_INCLUDE_DIR
|
||||
NAMES opencore-amrnb/interf_dec.h
|
||||
HINTS
|
||||
"${AMRNB_INCLUDE_DIR}"
|
||||
"${AMRNB_HINTS}/include"
|
||||
PATHS /usr/local/include /usr/include
|
||||
)
|
||||
|
||||
find_library( AMRNB_LIBRARY
|
||||
NAMES opencore-amrnb
|
||||
HINTS
|
||||
"${AMRNB_LIBDIR}"
|
||||
"${AMRNB_HINTS}/lib"
|
||||
PATHS /usr/local/lib /usr/lib
|
||||
)
|
||||
|
||||
include( FindPackageHandleStandardArgs )
|
||||
find_package_handle_standard_args( amrnb DEFAULT_MSG AMRNB_INCLUDE_DIR AMRNB_LIBRARY )
|
||||
|
||||
if( AMRNB_FOUND )
|
||||
set( AMRNB_INCLUDE_DIRS ${AMRNB_INCLUDE_DIR} )
|
||||
set( AMRNB_LIBRARIES ${AMRNB_LIBRARY} )
|
||||
if (WIN32)
|
||||
set ( AMRNB_DLL_DIR "${AMRNB_HINTS}/bin"
|
||||
CACHE PATH "Path to amrnb DLL"
|
||||
)
|
||||
file( GLOB _amrnb_dll RELATIVE "${AMRNB_DLL_DIR}"
|
||||
"${AMRNB_DLL_DIR}/libamrnb.dll"
|
||||
)
|
||||
set ( AMRNB_DLL ${_amrnb_dll}
|
||||
# We're storing filenames only. Should we use STRING instead?
|
||||
CACHE FILEPATH "amrnb DLL file name"
|
||||
)
|
||||
mark_as_advanced( AMRNB_DLL_DIR AMRNB_DLL )
|
||||
endif()
|
||||
else()
|
||||
set( AMRNB_INCLUDE_DIRS )
|
||||
set( AMRNB_LIBRARIES )
|
||||
endif()
|
||||
|
||||
mark_as_advanced( AMRNB_LIBRARIES AMRNB_INCLUDE_DIRS )
|
|
@ -0,0 +1,85 @@
|
|||
# CMake support for fseeko
|
||||
#
|
||||
# Based on FindLFS.cmake by
|
||||
# Copyright (C) 2016 Julian Andres Klode <jak@debian.org>.
|
||||
#
|
||||
# Permission is hereby granted, free of charge, to any person
|
||||
# obtaining a copy of this software and associated documentation files
|
||||
# (the "Software"), to deal in the Software without restriction,
|
||||
# including without limitation the rights to use, copy, modify, merge,
|
||||
# publish, distribute, sublicense, and/or sell copies of the Software,
|
||||
# and to permit persons to whom the Software is furnished to do so,
|
||||
# subject to the following conditions:
|
||||
#
|
||||
# The above copyright notice and this permission notice shall be
|
||||
# included in all copies or substantial portions of the Software.
|
||||
#
|
||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
||||
# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
||||
# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
# SOFTWARE.
|
||||
#
|
||||
# This defines the following variables
|
||||
#
|
||||
# FSEEKO_DEFINITIONS - List of definitions to pass to add_definitions()
|
||||
# FSEEKO_COMPILE_OPTIONS - List of definitions to pass to add_compile_options()
|
||||
# FSEEKO_LIBRARIES - List of libraries and linker flags
|
||||
# FSEEKO_FOUND - If there is Large files support
|
||||
#
|
||||
|
||||
include(CheckCSourceCompiles)
|
||||
include(FindPackageHandleStandardArgs)
|
||||
include(CMakePushCheckState)
|
||||
|
||||
# Check for the availability of fseeko()
|
||||
# The cases handled are:
|
||||
#
|
||||
# * Native fseeko()
|
||||
# * Preprocessor flag -D_LARGEFILE_SOURCE
|
||||
#
|
||||
function(_fseeko_check)
|
||||
set(_fseeko_cppflags)
|
||||
cmake_push_check_state()
|
||||
set(CMAKE_REQUIRED_QUIET 1)
|
||||
set(CMAKE_REQUIRED_DEFINITIONS ${LFS_DEFINITIONS})
|
||||
message(STATUS "Looking for native fseeko support")
|
||||
check_symbol_exists(fseeko stdio.h fseeko_native)
|
||||
cmake_pop_check_state()
|
||||
if (fseeko_native)
|
||||
message(STATUS "Looking for native fseeko support - found")
|
||||
set(FSEEKO_FOUND TRUE)
|
||||
else()
|
||||
message(STATUS "Looking for native fseeko support - not found")
|
||||
endif()
|
||||
|
||||
if (NOT FSEEKO_FOUND)
|
||||
# See if it's available with _LARGEFILE_SOURCE.
|
||||
cmake_push_check_state()
|
||||
set(CMAKE_REQUIRED_QUIET 1)
|
||||
set(CMAKE_REQUIRED_DEFINITIONS ${LFS_DEFINITIONS} "-D_LARGEFILE_SOURCE")
|
||||
check_symbol_exists(fseeko stdio.h fseeko_need_largefile_source)
|
||||
cmake_pop_check_state()
|
||||
if (fseeko_need_largefile_source)
|
||||
message(STATUS "Looking for fseeko support with _LARGEFILE_SOURCE - found")
|
||||
set(FSEEKO_FOUND TRUE)
|
||||
set(_fseeko_cppflags "-D_LARGEFILE_SOURCE")
|
||||
else()
|
||||
message(STATUS "Looking for fseeko support with _LARGEFILE_SOURCE - not found")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
set(FSEEKO_DEFINITIONS ${_fseeko_cppflags} CACHE STRING "Extra definitions for fseeko support")
|
||||
set(FSEEKO_COMPILE_OPTIONS "" CACHE STRING "Extra compiler options for fseeko support")
|
||||
set(FSEEKO_LIBRARIES "" CACHE STRING "Extra definitions for fseeko support")
|
||||
set(FSEEKO_FOUND ${FSEEKO_FOUND} CACHE INTERNAL "Found fseeko")
|
||||
endfunction()
|
||||
|
||||
if (NOT FSEEKO_FOUND)
|
||||
_fseeko_check()
|
||||
endif()
|
||||
|
||||
find_package_handle_standard_args(FSEEKO "Could not find fseeko. Set FSEEKO_DEFINITIONS, FSEEKO_COMPILE_OPTIONS, FSEEKO_LIBRARIES." FSEEKO_FOUND)
|
|
@ -0,0 +1,153 @@
|
|||
# CMake support for large files
|
||||
#
|
||||
# Copyright (C) 2016 Julian Andres Klode <jak@debian.org>.
|
||||
#
|
||||
# Permission is hereby granted, free of charge, to any person
|
||||
# obtaining a copy of this software and associated documentation files
|
||||
# (the "Software"), to deal in the Software without restriction,
|
||||
# including without limitation the rights to use, copy, modify, merge,
|
||||
# publish, distribute, sublicense, and/or sell copies of the Software,
|
||||
# and to permit persons to whom the Software is furnished to do so,
|
||||
# subject to the following conditions:
|
||||
#
|
||||
# The above copyright notice and this permission notice shall be
|
||||
# included in all copies or substantial portions of the Software.
|
||||
#
|
||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
||||
# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
||||
# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
# SOFTWARE.
|
||||
#
|
||||
# This defines the following variables
|
||||
#
|
||||
# LFS_DEFINITIONS - List of definitions to pass to add_definitions()
|
||||
# LFS_COMPILE_OPTIONS - List of definitions to pass to add_compile_options()
|
||||
# LFS_LIBRARIES - List of libraries and linker flags
|
||||
# LFS_FOUND - If there is Large files support
|
||||
#
|
||||
|
||||
include(CheckCSourceCompiles)
|
||||
include(FindPackageHandleStandardArgs)
|
||||
include(CMakePushCheckState)
|
||||
|
||||
# Test program to check for LFS. Requires that off_t has at least 8 byte large
|
||||
set(_lfs_test_source
|
||||
"
|
||||
#include <sys/types.h>
|
||||
typedef char my_static_assert[sizeof(off_t) >= 8 ? 1 : -1];
|
||||
int main(void) { return 0; }
|
||||
"
|
||||
)
|
||||
|
||||
# Check if the given options are needed
|
||||
#
|
||||
# This appends to the variables _lfs_cppflags, _lfs_cflags, and _lfs_ldflags,
|
||||
# it also sets LFS_FOUND to 1 if it works.
|
||||
function(_lfs_check_compiler_option var options definitions libraries)
|
||||
cmake_push_check_state()
|
||||
set(CMAKE_REQUIRED_QUIET 1)
|
||||
set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS} ${options})
|
||||
set(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} ${definitions})
|
||||
set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_DEFINITIONS} ${libraries})
|
||||
|
||||
message(STATUS "Looking for LFS support using ${options} ${definitions} ${libraries}")
|
||||
check_c_source_compiles("${_lfs_test_source}" ${var})
|
||||
cmake_pop_check_state()
|
||||
|
||||
if(${var})
|
||||
message(STATUS "Looking for LFS support using ${options} ${definitions} ${libraries} - found")
|
||||
set(_lfs_cppflags ${_lfs_cppflags} ${definitions} PARENT_SCOPE)
|
||||
set(_lfs_cflags ${_lfs_cflags} ${options} PARENT_SCOPE)
|
||||
set(_lfs_ldflags ${_lfs_ldflags} ${libraries} PARENT_SCOPE)
|
||||
set(LFS_FOUND TRUE PARENT_SCOPE)
|
||||
else()
|
||||
message(STATUS "Looking for LFS support using ${options} ${definitions} ${libraries} - not found")
|
||||
endif()
|
||||
endfunction()
|
||||
|
||||
# Check for the availability of LFS.
|
||||
# The cases handled are:
|
||||
#
|
||||
# * Native LFS
|
||||
# * Output of getconf LFS_CFLAGS; getconf LFS_LIBS; getconf LFS_LDFLAGS
|
||||
# * Preprocessor flag -D_FILE_OFFSET_BITS=64
|
||||
# * Preprocessor flag -D_LARGE_FILES
|
||||
#
|
||||
function(_lfs_check)
|
||||
set(_lfs_cflags)
|
||||
set(_lfs_cppflags)
|
||||
set(_lfs_ldflags)
|
||||
set(_lfs_libs)
|
||||
cmake_push_check_state()
|
||||
set(CMAKE_REQUIRED_QUIET 1)
|
||||
message(STATUS "Looking for native LFS support")
|
||||
check_c_source_compiles("${_lfs_test_source}" lfs_native)
|
||||
cmake_pop_check_state()
|
||||
if (lfs_native)
|
||||
message(STATUS "Looking for native LFS support - found")
|
||||
set(LFS_FOUND TRUE)
|
||||
else()
|
||||
message(STATUS "Looking for native LFS support - not found")
|
||||
endif()
|
||||
|
||||
if (NOT LFS_FOUND)
|
||||
# Check using getconf. If getconf fails, don't worry, the check in
|
||||
# _lfs_check_compiler_option will fail as well.
|
||||
execute_process(COMMAND getconf LFS_CFLAGS
|
||||
OUTPUT_VARIABLE _lfs_cflags_raw
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
ERROR_QUIET)
|
||||
execute_process(COMMAND getconf LFS_LIBS
|
||||
OUTPUT_VARIABLE _lfs_libs_tmp
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
ERROR_QUIET)
|
||||
execute_process(COMMAND getconf LFS_LDFLAGS
|
||||
OUTPUT_VARIABLE _lfs_ldflags_tmp
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
ERROR_QUIET)
|
||||
|
||||
separate_arguments(_lfs_cflags_raw)
|
||||
separate_arguments(_lfs_ldflags_tmp)
|
||||
separate_arguments(_lfs_libs_tmp)
|
||||
|
||||
# Move -D flags to the place they are supposed to be
|
||||
foreach(flag ${_lfs_cflags_raw})
|
||||
if (flag MATCHES "-D.*")
|
||||
list(APPEND _lfs_cppflags_tmp ${flag})
|
||||
else()
|
||||
list(APPEND _lfs_cflags_tmp ${flag})
|
||||
endif()
|
||||
endforeach()
|
||||
|
||||
# Check if the flags we received (if any) produce working LFS support
|
||||
_lfs_check_compiler_option(lfs_getconf_works
|
||||
"${_lfs_cflags_tmp}"
|
||||
"${_lfs_cppflags_tmp}"
|
||||
"${_lfs_libs_tmp};${_lfs_ldflags_tmp}")
|
||||
endif()
|
||||
|
||||
if(NOT LFS_FOUND) # IRIX stuff
|
||||
_lfs_check_compiler_option(lfs_need_n32 "-n32" "" "")
|
||||
endif()
|
||||
if(NOT LFS_FOUND) # Linux and friends
|
||||
_lfs_check_compiler_option(lfs_need_file_offset_bits "" "-D_FILE_OFFSET_BITS=64" "")
|
||||
endif()
|
||||
if(NOT LFS_FOUND) # AIX
|
||||
_lfs_check_compiler_option(lfs_need_large_files "" "-D_LARGE_FILES=1" "")
|
||||
endif()
|
||||
|
||||
set(LFS_DEFINITIONS ${_lfs_cppflags} CACHE STRING "Extra definitions for large file support")
|
||||
set(LFS_COMPILE_OPTIONS ${_lfs_cflags} CACHE STRING "Extra definitions for large file support")
|
||||
set(LFS_LIBRARIES ${_lfs_libs} ${_lfs_ldflags} CACHE STRING "Extra definitions for large file support")
|
||||
set(LFS_FOUND ${LFS_FOUND} CACHE INTERNAL "Found LFS")
|
||||
endfunction()
|
||||
|
||||
if (NOT LFS_FOUND)
|
||||
_lfs_check()
|
||||
endif()
|
||||
|
||||
find_package_handle_standard_args(LFS "Could not find LFS. Set LFS_DEFINITIONS, LFS_COMPILE_OPTIONS, LFS_LIBRARIES." LFS_FOUND)
|
|
@ -16,7 +16,7 @@ function( FindWSWinLibs _WS_LIB_SEARCH_PATH _LIB_HINT_VAR )
|
|||
file( TO_CMAKE_PATH "$ENV{WIRESHARK_LIB_DIR}" _PROJECT_LIB_DIR )
|
||||
else()
|
||||
file( TO_CMAKE_PATH "$ENV{WIRESHARK_BASE_DIR}" _WS_BASE_DIR )
|
||||
set( _PROJECT_LIB_DIR "${_WS_BASE_DIR}/wireshark-${WIRESHARK_TARGET_PLATFORM}-libs" )
|
||||
set( _PROJECT_LIB_DIR "${_WS_BASE_DIR}/wireshark-${WIRESHARK_TARGET_PLATFORM}-libs-3.4" )
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
|
|
@ -1,134 +0,0 @@
|
|||
# This code was copied from http://www.gromacs.org/
|
||||
# and its toplevel COPYING file starts with:
|
||||
#
|
||||
# GROMACS is free software, distributed under the GNU General Public License
|
||||
# (GPL) Version 2.
|
||||
|
||||
# - Define macro to check large file support
|
||||
#
|
||||
# GMX_TEST_LARGE_FILES(VARIABLE)
|
||||
#
|
||||
# VARIABLE will be set to true if 64-bit file support is available.
|
||||
# This macro will also set defines as necessary to enable large file
|
||||
# support, for instance:
|
||||
# _LARGE_FILES
|
||||
# _LARGEFILE_SOURCE
|
||||
# _FILE_OFFSET_BITS=64
|
||||
#
|
||||
# However, it is YOUR job to make sure these defines are set in a cmakedefine so they
|
||||
# end up in a config.h file that is included in your source if necessary!
|
||||
|
||||
MACRO(GMX_TEST_LARGE_FILES VARIABLE)
|
||||
IF(NOT DEFINED ${VARIABLE})
|
||||
if(CMAKE_C_COMPILER_ID MATCHES "MSVC")
|
||||
#
|
||||
# This is Visual Studio; Visual Studio has supported
|
||||
# _fseeki64 and _ftelli64 since Visual Studio 2005 / MSVCR80,
|
||||
# and we require newer versions, so we know we have them.
|
||||
#
|
||||
MESSAGE(STATUS "_fseeki64 and _ftelli64 are present")
|
||||
else(CMAKE_C_COMPILER_ID MATCHES "MSVC")
|
||||
#
|
||||
# This is UN*X, or some other Windows compiler.
|
||||
#
|
||||
# For UN*X, we do the Large File Support tests, to see
|
||||
# whether it's present and, if so what we need to define
|
||||
# to enable it.
|
||||
#
|
||||
# XXX - what's the right thing to do on Windows with,
|
||||
# for example, MinGW?
|
||||
#
|
||||
# On most platforms it is probably overkill to first test
|
||||
# the flags for 64-bit off_t, and then separately fseeko.
|
||||
# However, in the future we might have 128-bit seek offsets
|
||||
# to support 128-bit filesystems that allow 128-bit offsets
|
||||
# (ZFS), so it might be dangerous to indiscriminately set
|
||||
# e.g. _FILE_OFFSET_BITS=64.
|
||||
#
|
||||
MESSAGE(STATUS "Checking for 64-bit off_t")
|
||||
|
||||
# First check without any special flags
|
||||
TRY_COMPILE(FILE64_OK "${CMAKE_BINARY_DIR}"
|
||||
"${CMAKE_SOURCE_DIR}/cmake/TestFileOffsetBits.c")
|
||||
if(FILE64_OK)
|
||||
MESSAGE(STATUS "64-bit off_t is present with no special flags")
|
||||
endif(FILE64_OK)
|
||||
|
||||
if(NOT FILE64_OK)
|
||||
# Test with _FILE_OFFSET_BITS=64
|
||||
TRY_COMPILE(FILE64_OK "${CMAKE_BINARY_DIR}"
|
||||
"${CMAKE_SOURCE_DIR}/cmake/TestFileOffsetBits.c"
|
||||
COMPILE_DEFINITIONS "-D_FILE_OFFSET_BITS=64" )
|
||||
if(FILE64_OK)
|
||||
MESSAGE(STATUS "64-bit off_t is present with _FILE_OFFSET_BITS=64")
|
||||
set(_FILE_OFFSET_BITS 64 CACHE INTERNAL "64-bit off_t requires _FILE_OFFSET_BITS=64")
|
||||
endif(FILE64_OK)
|
||||
endif(NOT FILE64_OK)
|
||||
|
||||
if(NOT FILE64_OK)
|
||||
# Test with _LARGE_FILES
|
||||
TRY_COMPILE(FILE64_OK "${CMAKE_BINARY_DIR}"
|
||||
"${CMAKE_SOURCE_DIR}/cmake/TestFileOffsetBits.c"
|
||||
COMPILE_DEFINITIONS "-D_LARGE_FILES" )
|
||||
if(FILE64_OK)
|
||||
MESSAGE(STATUS "64-bit off_t is present with _LARGE_FILES")
|
||||
set(_LARGE_FILES 1 CACHE INTERNAL "64-bit off_t requires _LARGE_FILES")
|
||||
endif(FILE64_OK)
|
||||
endif(NOT FILE64_OK)
|
||||
|
||||
if(NOT FILE64_OK)
|
||||
# Test with _LARGEFILE_SOURCE
|
||||
TRY_COMPILE(FILE64_OK "${CMAKE_BINARY_DIR}"
|
||||
"${CMAKE_SOURCE_DIR}/cmake/TestFileOffsetBits.c"
|
||||
COMPILE_DEFINITIONS "-D_LARGEFILE_SOURCE" )
|
||||
if(FILE64_OK)
|
||||
MESSAGE(STATUS "64-bit off_t is present with _LARGEFILE_SOURCE")
|
||||
set(_LARGEFILE_SOURCE 1 CACHE INTERNAL "64-bit off_t requires _LARGEFILE_SOURCE")
|
||||
endif(FILE64_OK)
|
||||
endif(NOT FILE64_OK)
|
||||
|
||||
if(NOT FILE64_OK)
|
||||
MESSAGE(STATUS "64-bit file offset support not available")
|
||||
else(NOT FILE64_OK)
|
||||
# Set the flags we might have determined to be required above
|
||||
configure_file("${CMAKE_SOURCE_DIR}/cmake/TestLargeFiles.c.cmakein"
|
||||
"${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/TestLargeFiles.c")
|
||||
|
||||
#
|
||||
# If this is Windows, assume we have _fseeki64/_ftelli64
|
||||
# available. If this is UN*X, check for fseeko/ftello.
|
||||
#
|
||||
if(NOT WIN32)
|
||||
MESSAGE(STATUS "Checking for fseeko/ftello")
|
||||
# Test if ftello/fseeko are available
|
||||
TRY_COMPILE(FSEEKO_COMPILE_OK "${CMAKE_BINARY_DIR}"
|
||||
"${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/TestLargeFiles.c")
|
||||
if(FSEEKO_COMPILE_OK)
|
||||
MESSAGE(STATUS "Checking for fseeko/ftello - present")
|
||||
endif(FSEEKO_COMPILE_OK)
|
||||
|
||||
if(NOT FSEEKO_COMPILE_OK)
|
||||
# glibc 2.2 neds _LARGEFILE_SOURCE for fseeko (but not 64-bit off_t...)
|
||||
TRY_COMPILE(FSEEKO_COMPILE_OK "${CMAKE_BINARY_DIR}"
|
||||
"${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/TestLargeFiles.c"
|
||||
COMPILE_DEFINITIONS "-D_LARGEFILE_SOURCE" )
|
||||
if(FSEEKO_COMPILE_OK)
|
||||
MESSAGE(STATUS "Checking for fseeko/ftello - present with _LARGEFILE_SOURCE")
|
||||
set(_LARGEFILE_SOURCE 1 CACHE INTERNAL "64-bit fseeko requires _LARGEFILE_SOURCE")
|
||||
endif(FSEEKO_COMPILE_OK)
|
||||
endif(NOT FSEEKO_COMPILE_OK)
|
||||
if(FSEEKO_COMPILE_OK)
|
||||
SET(${VARIABLE} 1 CACHE INTERNAL "Result of test for large file support" FORCE)
|
||||
set(HAVE_FSEEKO 1 CACHE INTERNAL "64-bit fseeko is available" FORCE)
|
||||
else(FSEEKO_COMPILE_OK)
|
||||
MESSAGE(STATUS "Checking for fseeko/ftello - not found")
|
||||
SET(${VARIABLE} 0 CACHE INTERNAL "Result of test for large file support" FORCE)
|
||||
endif(FSEEKO_COMPILE_OK)
|
||||
endif(NOT WIN32)
|
||||
endif(NOT FILE64_OK)
|
||||
endif(CMAKE_C_COMPILER_ID MATCHES "MSVC")
|
||||
ENDIF(NOT DEFINED ${VARIABLE})
|
||||
ENDMACRO(GMX_TEST_LARGE_FILES VARIABLE)
|
||||
|
||||
|
||||
|
|
@ -40,6 +40,9 @@
|
|||
/* Define to 1 if you have the <arpa/inet.h> header file. */
|
||||
#cmakedefine HAVE_ARPA_INET_H 1
|
||||
|
||||
/* Define to 1 if you have the `clock_gettime` function. */
|
||||
#cmakedefine HAVE_CLOCK_GETTIME 1
|
||||
|
||||
/* Define to 1 if you have the <fcntl.h> header file. */
|
||||
#cmakedefine HAVE_FCNTL_H 1
|
||||
|
||||
|
@ -241,6 +244,9 @@
|
|||
/* Define to 1 if you have the speexdsp library. */
|
||||
#cmakedefine HAVE_SPEEXDSP 1
|
||||
|
||||
/* Define to 1 if you have the opencore-amrnb library. */
|
||||
#cmakedefine HAVE_AMRNB 1
|
||||
|
||||
/* Define to 1 if you have the lixbml2 library. */
|
||||
#cmakedefine HAVE_LIBXML2 1
|
||||
|
||||
|
@ -322,12 +328,6 @@
|
|||
/* Build androiddump with libpcap instead of wireshark stuff */
|
||||
#cmakedefine ANDROIDDUMP_USE_LIBPCAP 1
|
||||
|
||||
/* Large file support */
|
||||
#cmakedefine _LARGEFILE_SOURCE
|
||||
#cmakedefine _LARGEFILE64_SOURCE
|
||||
#cmakedefine _LARGE_FILES
|
||||
#cmakedefine _FILE_OFFSET_BITS @_FILE_OFFSET_BITS@
|
||||
|
||||
/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
|
||||
`char[]'. */
|
||||
/* Note: not use in the code */
|
||||
|
|
|
@ -0,0 +1,99 @@
|
|||
# CMakeLists.txt
|
||||
#
|
||||
# Wireshark - Network traffic analyzer
|
||||
# By Gerald Combs <gerald@wireshark.org>
|
||||
# Copyright 1998 Gerald Combs
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
#
|
||||
|
||||
set(WSCODECS_PUBLIC_HEADERS
|
||||
codecs.h
|
||||
)
|
||||
|
||||
set(WSCODECS_FILES
|
||||
codecs.c
|
||||
G711a/G711adecode.c
|
||||
G711u/G711udecode.c
|
||||
speex/resample.c
|
||||
)
|
||||
|
||||
# Enables visibility in IDEs
|
||||
file(GLOB EXTRA_CODEC_HEADERS
|
||||
codecs.h
|
||||
G711a/G711adecode.h G711a/G711atable.h
|
||||
G711u/G711udecode.h G711u/G711utable.h
|
||||
speex/arch.h
|
||||
speex/speex_resampler.h
|
||||
speex/stack_alloc.h
|
||||
)
|
||||
|
||||
if(SBC_FOUND)
|
||||
set(WSCODECS_FILES ${WSCODECS_FILES} sbc/sbc.c)
|
||||
endif()
|
||||
|
||||
set(wscodecs_LIBS
|
||||
${M_LIBRARIES}
|
||||
${GMODULE2_LIBRARIES}
|
||||
${SBC_LIBRARIES}
|
||||
wsutil
|
||||
)
|
||||
|
||||
if(HAVE_SPANDSP)
|
||||
list(APPEND WSCODECS_FILES G722/G722decode.c G726/G726decode.c)
|
||||
list(APPEND wscodecs_LIBS ${SPANDSP_LIBRARIES})
|
||||
endif()
|
||||
|
||||
if(HAVE_BCG729)
|
||||
list(APPEND WSCODECS_FILES G729/G729decode.c)
|
||||
list(APPEND wscodecs_LIBS ${BCG729_LIBRARIES})
|
||||
endif()
|
||||
|
||||
if(AMRNB_FOUND)
|
||||
list(APPEND WSCODECS_FILES amr/amrdecode.c)
|
||||
list(APPEND wscodecs_LIBS ${AMRNB_LIBRARIES})
|
||||
endif()
|
||||
|
||||
add_library(wscodecs
|
||||
${WSCODECS_FILES}
|
||||
${CMAKE_BINARY_DIR}/image/libwscodecs.rc
|
||||
)
|
||||
|
||||
set(FULL_SO_VERSION "0.0.0")
|
||||
|
||||
set_target_properties(wscodecs PROPERTIES
|
||||
PREFIX "lib"
|
||||
COMPILE_DEFINITIONS "WS_BUILD_DLL"
|
||||
LINK_FLAGS "${WS_LINK_FLAGS}"
|
||||
VERSION ${FULL_SO_VERSION} SOVERSION 0
|
||||
FOLDER "DLLs"
|
||||
)
|
||||
|
||||
if(ENABLE_APPLICATION_BUNDLE)
|
||||
set_target_properties(wscodecs PROPERTIES
|
||||
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/run/Wireshark.app/Contents/Frameworks
|
||||
)
|
||||
endif()
|
||||
|
||||
target_link_libraries(wscodecs ${wscodecs_LIBS})
|
||||
|
||||
install(TARGETS wscodecs
|
||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
)
|
||||
|
||||
if(NOT WIN32)
|
||||
install(FILES ${WSCODECS_PUBLIC_HEADERS}
|
||||
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${CPACK_PACKAGE_NAME}/codecs"
|
||||
)
|
||||
endif()
|
||||
|
||||
CHECKAPI(
|
||||
NAME
|
||||
codecs
|
||||
SWITCHES
|
||||
-g abort -g termoutput -build
|
||||
SOURCES
|
||||
${WSCODECS_FILES}
|
||||
)
|
|
@ -1,4 +1,4 @@
|
|||
wireshark (3.3.2) unstable; urgency=low
|
||||
wireshark (3.4.7) unstable; urgency=low
|
||||
|
||||
* Self-made package
|
||||
|
||||
|
|
|
@ -26,8 +26,8 @@ Homepage: https://www.wireshark.org/
|
|||
|
||||
Package: wireshark-common
|
||||
Architecture: any
|
||||
Depends: ${shlibs:Depends}, ${misc:Depends}, libwireshark0 (>= ${binary:Version}),
|
||||
libwiretap0 (>= ${binary:Version}), debconf, libcap2-bin [linux-any]
|
||||
Depends: ${shlibs:Depends}, ${misc:Depends}, libwireshark14 (>= ${binary:Version}),
|
||||
libwiretap11 (>= ${binary:Version}), debconf, libcap2-bin [linux-any]
|
||||
Recommends: wireshark (>= ${binary:Version}) | tshark (>= ${binary:Version})
|
||||
Breaks: ethereal (<< 1.0.0-3),
|
||||
wireshark (<< 2.0.0~),
|
||||
|
@ -124,13 +124,13 @@ Description: network traffic analyzer - documentation
|
|||
This package contains Wireshark User's guide, Wireshark Developer's Guide
|
||||
and the Lua Reference.
|
||||
|
||||
Package: libwireshark0
|
||||
Package: libwireshark14
|
||||
Section: libs
|
||||
Architecture: any
|
||||
Multi-Arch: same
|
||||
Pre-Depends: ${misc:Pre-Depends}
|
||||
Depends: ${shlibs:Depends}, ${misc:Depends}, libwireshark-data (>= ${source:Version}),
|
||||
libwsutil0 (>= ${source:Version})
|
||||
libwsutil12 (>= ${source:Version})
|
||||
Suggests: wireshark-doc (>= ${source:Version})
|
||||
Conflicts: wireshark-common (<< 1.4.0~rc2-1)
|
||||
Replaces: wireshark-common (<< 1.4.0~rc2-1)
|
||||
|
@ -138,7 +138,7 @@ Description: network packet dissection library -- shared library
|
|||
The libwireshark library provides the network packet dissection services
|
||||
developed by the Wireshark project.
|
||||
|
||||
Package: libwsutil0
|
||||
Package: libwsutil12
|
||||
Section: libs
|
||||
Architecture: any
|
||||
Multi-Arch: same
|
||||
|
@ -147,12 +147,12 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
|
|||
Conflicts: wireshark-common (<< 1.4.0~rc2-1), libwireshark1 (<< 1.4.2-2)
|
||||
Replaces: wireshark-common (<< 1.4.0~rc2-1), libwireshark1 (<< 1.4.2-2)
|
||||
Description: network packet dissection utilities library -- shared library
|
||||
The libwsutil library provides utility functions for libwireshark0.
|
||||
The libwsutil library provides utility functions for libwireshark14.
|
||||
|
||||
Package: libwsutil-dev
|
||||
Section: libdevel
|
||||
Architecture: any
|
||||
Depends: ${misc:Depends} , libwsutil0 (= ${binary:Version})
|
||||
Depends: ${misc:Depends} , libwsutil12 (= ${binary:Version})
|
||||
Conflicts: wireshark-common (<< 1.4.0~rc2-1), libwireshark-dev (<< 1.4.2-2),
|
||||
wireshark-dev (<< 1.4.0~rc2-1)
|
||||
Replaces: wireshark-common (<< 1.4.0~rc2-1), libwireshark-dev (<< 1.4.2-2),
|
||||
|
@ -181,7 +181,7 @@ Description: network packet dissection library -- data files
|
|||
Package: libwireshark-dev
|
||||
Section: libdevel
|
||||
Depends: ${misc:Depends}, libwsutil-dev, libwiretap-dev,
|
||||
libwireshark0 (= ${binary:Version})
|
||||
libwireshark14 (= ${binary:Version})
|
||||
Conflicts: wireshark-dev (<< 1.4.0~rc2-1)
|
||||
Replaces: wireshark-dev (<< 1.4.0~rc2-1)
|
||||
Architecture: any
|
||||
|
@ -192,7 +192,7 @@ Description: network packet dissection library -- development files
|
|||
This package contains the static library and the C header files that are
|
||||
needed for applications to use libwireshark services.
|
||||
|
||||
Package: libwiretap0
|
||||
Package: libwiretap11
|
||||
Section: libs
|
||||
Architecture: any
|
||||
Multi-Arch: same
|
||||
|
@ -227,7 +227,7 @@ Description: network packet capture library -- shared library
|
|||
|
||||
Package: libwiretap-dev
|
||||
Section: libdevel
|
||||
Depends: ${misc:Depends}, libwiretap0 (= ${binary:Version})
|
||||
Depends: ${misc:Depends}, libwiretap11 (= ${binary:Version})
|
||||
Conflicts: wireshark-dev (<< 1.4.0~rc2-1)
|
||||
Replaces: wireshark-dev (<< 1.4.0~rc2-1)
|
||||
Architecture: any
|
||||
|
|
|
@ -1,8 +0,0 @@
|
|||
# from file-elf.c
|
||||
libwireshark0: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libwireshark.so.0.0.0 Synopsys Synopsis
|
||||
|
||||
# Typo directly on IANA enterprise-numbers (epan/enterprise-numbers)
|
||||
|
||||
libwireshark0: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libwireshark.so.0.0.0 Nam Name
|
||||
libwireshark0: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libwireshark.so.0.0.0 Informations Information
|
||||
libwireshark0: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libwireshark.so.0.0.0 Dont Don't
|
|
@ -0,0 +1,8 @@
|
|||
# from file-elf.c
|
||||
libwireshark14: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libwireshark.so.14.0.0 Synopsys Synopsis
|
||||
|
||||
# Typo directly on IANA enterprise-numbers (epan/enterprise-numbers)
|
||||
|
||||
libwireshark14: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libwireshark.so.14.0.0 Nam Name
|
||||
libwireshark14: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libwireshark.so.14.0.0 Informations Information
|
||||
libwireshark14: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libwireshark.so.14.0.0 Dont Don't
|
|
@ -1,4 +1,4 @@
|
|||
libwireshark.so.0 libwireshark0 #MINVER#
|
||||
libwireshark.so.14 libwireshark14 #MINVER#
|
||||
AdmissionRejectReason_vals@Base 1.9.1
|
||||
BandRejectReason_vals@Base 1.9.1
|
||||
CommandCode_vals_ext@Base 1.9.1
|
||||
|
@ -943,6 +943,7 @@ libwireshark.so.0 libwireshark0 #MINVER#
|
|||
maxmind_db_get_paths@Base 2.5.1
|
||||
maxmind_db_lookup_ipv4@Base 2.5.1
|
||||
maxmind_db_lookup_ipv6@Base 2.5.1
|
||||
maxmind_db_set_synchrony@Base 3.4.5
|
||||
mbim_register_uuid_ext@Base 1.12.0~rc1
|
||||
memory_usage_component_register@Base 1.12.0~rc1
|
||||
memory_usage_gc@Base 1.12.0~rc1
|
|
@ -1,4 +1,4 @@
|
|||
libwiretap.so.0 libwiretap0 #MINVER#
|
||||
libwiretap.so.11 libwiretap11 #MINVER#
|
||||
file_eof@Base 1.9.1
|
||||
file_error@Base 1.9.1
|
||||
file_getc@Base 1.9.1
|
|
@ -1,4 +1,4 @@
|
|||
libwsutil.so.0 libwsutil0 #MINVER#
|
||||
libwsutil.so.12 libwsutil12 #MINVER#
|
||||
Dot11DecryptWepDecrypt@Base 2.5.0
|
||||
Eax_Decrypt@Base 1.12.0~rc1
|
||||
adler32_bytes@Base 1.12.0~rc1
|
|
@ -1,17 +1,20 @@
|
|||
# SOME DESCRIPTIVE TITLE.
|
||||
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
|
||||
# This file is distributed under the same license as the wireshark package.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
# Translators:
|
||||
# Martin Sin <martin.sin@zshk.cz>, 2009
|
||||
# Gerald Combs <gerald@wireshark.org>, 2020
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Wireshark\n"
|
||||
"Project-Id-Version: wireshark\n"
|
||||
"Report-Msgid-Bugs-To: wireshark@packages.debian.org\n"
|
||||
"POT-Creation-Date: 2017-08-06 18:31-0400\n"
|
||||
"PO-Revision-Date: 2017-09-22 06:50+0000\n"
|
||||
"Last-Translator: Gerald Combs <gerald@wireshark.org>\n"
|
||||
"Language-Team: Czech (http://www.transifex.com/wireshark/wireshark/language/cs/)\n"
|
||||
"PO-Revision-Date: 2020-10-22 19:57+0000\n"
|
||||
"Last-Translator: Gerald Combs <gerald@wireshark.org>, 2020\n"
|
||||
"Language-Team: Czech (https://www.transifex.com/wireshark/teams/36457/cs/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
@ -32,7 +35,12 @@ msgid ""
|
|||
"system group to capture packets. This is recommended over the alternative of"
|
||||
" running Wireshark/Tshark directly as root, because less of the code will "
|
||||
"run with elevated privileges."
|
||||
msgstr "Dumpcap můžete nainstalovat tak, že budou moci zachytávat pakety pouze členové skupiny „wireshark“. Tento způsob zachytávání paketů pomocí Wireshark/Tshark se obecně doporučuje. Druhou možností je spuštění programu přímo pod superuživatelem, to ovšem nelze doporučit, protože je pak pod tímto uživatelem spuštěna větší část potencionálně nebezpečného kódu."
|
||||
msgstr ""
|
||||
"Dumpcap můžete nainstalovat tak, že budou moci zachytávat pakety pouze "
|
||||
"členové skupiny „wireshark“. Tento způsob zachytávání paketů pomocí "
|
||||
"Wireshark/Tshark se obecně doporučuje. Druhou možností je spuštění programu "
|
||||
"přímo pod superuživatelem, to ovšem nelze doporučit, protože je pak pod "
|
||||
"tímto uživatelem spuštěna větší část potencionálně nebezpečného kódu."
|
||||
|
||||
#. Type: boolean
|
||||
#. Description
|
||||
|
@ -40,7 +48,9 @@ msgstr "Dumpcap můžete nainstalovat tak, že budou moci zachytávat pakety pou
|
|||
msgid ""
|
||||
"For more detailed information please see /usr/share/doc/wireshark-"
|
||||
"common/README.Debian."
|
||||
msgstr "Pro více informací se prosím podívejte na /usr/share/doc/wireshark-common/README.Debian."
|
||||
msgstr ""
|
||||
"Pro více informací se prosím podívejte na /usr/share/doc/wireshark-"
|
||||
"common/README.Debian."
|
||||
|
||||
#. Type: boolean
|
||||
#. Description
|
||||
|
@ -48,7 +58,10 @@ msgstr "Pro více informací se prosím podívejte na /usr/share/doc/wireshark-c
|
|||
msgid ""
|
||||
"Enabling this feature may be a security risk, so it is disabled by default. "
|
||||
"If in doubt, it is suggested to leave it disabled."
|
||||
msgstr "Povolení této možnosti může být bezpečnostním rizikem a tak je ve výchozím nastavení vypnuté. Jste-li na pochybách, doporučuje se nechat volbu vypnutou."
|
||||
msgstr ""
|
||||
"Povolení této možnosti může být bezpečnostním rizikem a tak je ve výchozím "
|
||||
"nastavení vypnuté. Jste-li na pochybách, doporučuje se nechat volbu "
|
||||
"vypnutou."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
|
|
@ -1,17 +1,20 @@
|
|||
# SOME DESCRIPTIVE TITLE.
|
||||
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
|
||||
# This file is distributed under the same license as the wireshark package.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
# Translators:
|
||||
# Joe Hansen <joedalton2@yahoo.dk>, 2010
|
||||
# Gerald Combs <gerald@wireshark.org>, 2020
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Wireshark\n"
|
||||
"Project-Id-Version: wireshark\n"
|
||||
"Report-Msgid-Bugs-To: wireshark@packages.debian.org\n"
|
||||
"POT-Creation-Date: 2017-08-06 18:31-0400\n"
|
||||
"PO-Revision-Date: 2017-09-22 06:50+0000\n"
|
||||
"Last-Translator: Gerald Combs <gerald@wireshark.org>\n"
|
||||
"Language-Team: Danish (http://www.transifex.com/wireshark/wireshark/language/da/)\n"
|
||||
"PO-Revision-Date: 2020-10-22 19:57+0000\n"
|
||||
"Last-Translator: Gerald Combs <gerald@wireshark.org>, 2020\n"
|
||||
"Language-Team: Danish (https://www.transifex.com/wireshark/teams/36457/da/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
@ -32,7 +35,11 @@ msgid ""
|
|||
"system group to capture packets. This is recommended over the alternative of"
|
||||
" running Wireshark/Tshark directly as root, because less of the code will "
|
||||
"run with elevated privileges."
|
||||
msgstr "Dumpcap kan installeres på en måde som tillader medlemmer af systemgruppen »wireshark« at fange pakker. Dette anbefales frem for alternativet med at køre Wireshark/Tshark direkte som rod (root), da mindre af koden vil køre med ophøjede privilegier."
|
||||
msgstr ""
|
||||
"Dumpcap kan installeres på en måde som tillader medlemmer af systemgruppen "
|
||||
"»wireshark« at fange pakker. Dette anbefales frem for alternativet med at "
|
||||
"køre Wireshark/Tshark direkte som rod (root), da mindre af koden vil køre "
|
||||
"med ophøjede privilegier."
|
||||
|
||||
#. Type: boolean
|
||||
#. Description
|
||||
|
@ -40,7 +47,9 @@ msgstr "Dumpcap kan installeres på en måde som tillader medlemmer af systemgru
|
|||
msgid ""
|
||||
"For more detailed information please see /usr/share/doc/wireshark-"
|
||||
"common/README.Debian."
|
||||
msgstr "For mere detaljerede information se venligst /usr/share/doc/wireshark-common/README.Debian."
|
||||
msgstr ""
|
||||
"For mere detaljerede information se venligst /usr/share/doc/wireshark-"
|
||||
"common/README.Debian."
|
||||
|
||||
#. Type: boolean
|
||||
#. Description
|
||||
|
@ -48,7 +57,10 @@ msgstr "For mere detaljerede information se venligst /usr/share/doc/wireshark-co
|
|||
msgid ""
|
||||
"Enabling this feature may be a security risk, so it is disabled by default. "
|
||||
"If in doubt, it is suggested to leave it disabled."
|
||||
msgstr "Aktivering af denne funktion kan udgøre en sikkerhedsrisiko, så som standard er den deaktiveret. Hvis du er i tvivl, anbefales det at lade den være deaktiveret."
|
||||
msgstr ""
|
||||
"Aktivering af denne funktion kan udgøre en sikkerhedsrisiko, så som standard"
|
||||
" er den deaktiveret. Hvis du er i tvivl, anbefales det at lade den være "
|
||||
"deaktiveret."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
|
|
@ -1,22 +1,20 @@
|
|||
# SOME DESCRIPTIVE TITLE.
|
||||
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
|
||||
# This file is distributed under the same license as the wireshark package.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
# Translators:
|
||||
# Dominik Eismann <dominik.eismann@posteo.de>, 2016
|
||||
# Dominik Eismann <dominik.eismann@posteo.de>, 2016
|
||||
# uhei, 2017
|
||||
# uhei, 2015,2017
|
||||
# Uli Heilmeier, 2015
|
||||
# uhei, 2015
|
||||
# Gerald Combs <gerald@wireshark.org>, 2020
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Wireshark\n"
|
||||
"Project-Id-Version: wireshark\n"
|
||||
"Report-Msgid-Bugs-To: wireshark@packages.debian.org\n"
|
||||
"POT-Creation-Date: 2017-08-06 18:31-0400\n"
|
||||
"PO-Revision-Date: 2017-09-22 06:50+0000\n"
|
||||
"Last-Translator: uhei\n"
|
||||
"Language-Team: German (http://www.transifex.com/wireshark/wireshark/language/de/)\n"
|
||||
"PO-Revision-Date: 2020-10-22 19:57+0000\n"
|
||||
"Last-Translator: Gerald Combs <gerald@wireshark.org>, 2020\n"
|
||||
"Language-Team: German (https://www.transifex.com/wireshark/teams/36457/de/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
@ -37,7 +35,11 @@ msgid ""
|
|||
"system group to capture packets. This is recommended over the alternative of"
|
||||
" running Wireshark/Tshark directly as root, because less of the code will "
|
||||
"run with elevated privileges."
|
||||
msgstr "Dumpcap kann so installiert werden, dass es Mitgliedern der Systemgruppe \"wireshark\" erlaubt ist Pakete aufzuzeichnen. Da hier weniger Programmcode mit erhöhten Rechten ausgeführt wird ist diese Option eher zu empfehlen anstatt Wireshark/Tshark direkt als root-Benutzer zu starten."
|
||||
msgstr ""
|
||||
"Dumpcap kann so installiert werden, dass es Mitgliedern der Systemgruppe "
|
||||
"\"wireshark\" erlaubt ist Pakete aufzuzeichnen. Da hier weniger Programmcode"
|
||||
" mit erhöhten Rechten ausgeführt wird ist diese Option eher zu empfehlen "
|
||||
"anstatt Wireshark/Tshark direkt als root-Benutzer zu starten."
|
||||
|
||||
#. Type: boolean
|
||||
#. Description
|
||||
|
@ -45,7 +47,9 @@ msgstr "Dumpcap kann so installiert werden, dass es Mitgliedern der Systemgruppe
|
|||
msgid ""
|
||||
"For more detailed information please see /usr/share/doc/wireshark-"
|
||||
"common/README.Debian."
|
||||
msgstr "Weitere detaillierte Informationen sind unter /usr/share/doc/wireshark-common/README.Debian zu finden."
|
||||
msgstr ""
|
||||
"Weitere detaillierte Informationen sind unter /usr/share/doc/wireshark-"
|
||||
"common/README.Debian zu finden."
|
||||
|
||||
#. Type: boolean
|
||||
#. Description
|
||||
|
@ -53,7 +57,10 @@ msgstr "Weitere detaillierte Informationen sind unter /usr/share/doc/wireshark-c
|
|||
msgid ""
|
||||
"Enabling this feature may be a security risk, so it is disabled by default. "
|
||||
"If in doubt, it is suggested to leave it disabled."
|
||||
msgstr "Da das Aktivieren dieser Funktion ein Sicherheitsrisiko darstellen kann, ist es standardmäßig deaktiviert. Es wird Empfohlen dies im Zweifelsfall deaktiviert zu lassen."
|
||||
msgstr ""
|
||||
"Da das Aktivieren dieser Funktion ein Sicherheitsrisiko darstellen kann, ist"
|
||||
" es standardmäßig deaktiviert. Es wird Empfohlen dies im Zweifelsfall "
|
||||
"deaktiviert zu lassen."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
@ -67,7 +74,10 @@ msgstr "Erstellen der wireshark Systemgruppe fehlgeschlagen"
|
|||
msgid ""
|
||||
"The wireshark group does not exist, and creating it failed, so Wireshark "
|
||||
"cannot be configured to capture traffic as an unprivileged user."
|
||||
msgstr "Die wireshark Gruppe existiert nicht und konnte nicht erstellt werden. Wireshark kann daher nicht so konfiguriert werden, dass ein Mitschnitt von Datenverkehr auch einem unpreviligiertem Benutzer möglich ist."
|
||||
msgstr ""
|
||||
"Die wireshark Gruppe existiert nicht und konnte nicht erstellt werden. "
|
||||
"Wireshark kann daher nicht so konfiguriert werden, dass ein Mitschnitt von "
|
||||
"Datenverkehr auch einem unpreviligiertem Benutzer möglich ist."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
@ -75,7 +85,9 @@ msgstr "Die wireshark Gruppe existiert nicht und konnte nicht erstellt werden. W
|
|||
msgid ""
|
||||
"Please create the wireshark system group and try configuring wireshark-"
|
||||
"common again."
|
||||
msgstr "Bitte erstellen Sie die wireshark Systemgruppe und rekonfigurieren Sie wireshark-common nochmals."
|
||||
msgstr ""
|
||||
"Bitte erstellen Sie die wireshark Systemgruppe und rekonfigurieren Sie "
|
||||
"wireshark-common nochmals."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
@ -89,7 +101,9 @@ msgstr "Die wireshark Gruppe ist eine Systemgruppe"
|
|||
msgid ""
|
||||
"The wireshark group exists as a user group, but the preferred configuration "
|
||||
"is for it to be created as a system group."
|
||||
msgstr "Die wireshark Gruppe existiert als eine Benutzergruppe. Die bevorzugte Konfiguration sieht vor, dass die Gruppe als Systemgruppe erstellt wird."
|
||||
msgstr ""
|
||||
"Die wireshark Gruppe existiert als eine Benutzergruppe. Die bevorzugte "
|
||||
"Konfiguration sieht vor, dass die Gruppe als Systemgruppe erstellt wird."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
@ -97,7 +111,9 @@ msgstr "Die wireshark Gruppe existiert als eine Benutzergruppe. Die bevorzugte K
|
|||
msgid ""
|
||||
"As a result, purging wireshark-common will not remove the wireshark group, "
|
||||
"but everything else should work properly."
|
||||
msgstr "Als Ergebnis wird ein Löschen von wireshark-common nicht die Gruppe wireshark entfernen. Alles andere sollte normal funktionieren."
|
||||
msgstr ""
|
||||
"Als Ergebnis wird ein Löschen von wireshark-common nicht die Gruppe "
|
||||
"wireshark entfernen. Alles andere sollte normal funktionieren."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
@ -111,7 +127,10 @@ msgstr "Setzen der Einstellungen für dumpcap fehlgeschlagen"
|
|||
msgid ""
|
||||
"The attempt to use Linux capabilities to grant packet-capturing privileges "
|
||||
"to the dumpcap binary failed. Instead, it has had the set-user-id bit set."
|
||||
msgstr "Der Versuch die Linux Fähigkeiten zum Berechtigen von Paket-Mitschnitten für dumpcamp zu vergeben ist gescheitert. Es wurde daher das Set-User-ID Bit gesetzt."
|
||||
msgstr ""
|
||||
"Der Versuch die Linux Fähigkeiten zum Berechtigen von Paket-Mitschnitten für"
|
||||
" dumpcamp zu vergeben ist gescheitert. Es wurde daher das Set-User-ID Bit "
|
||||
"gesetzt."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
@ -126,7 +145,11 @@ msgid ""
|
|||
"When the wireshark-common package is configured to allow non-superusers to "
|
||||
"capture packets the postinst script of wireshark-common creates the "
|
||||
"wireshark group as a system group."
|
||||
msgstr "Wenn das wireshark-common Paket so konfiguriert wird, damit einem Nicht-Superuser das Mitschneiden von Paketen erlaubt ist, dann wird das postinst Skript von wireshark-common die wireshark Gruppe als eine Systemgruppe erstellen."
|
||||
msgstr ""
|
||||
"Wenn das wireshark-common Paket so konfiguriert wird, damit einem Nicht-"
|
||||
"Superuser das Mitschneiden von Paketen erlaubt ist, dann wird das postinst "
|
||||
"Skript von wireshark-common die wireshark Gruppe als eine Systemgruppe "
|
||||
"erstellen."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
@ -134,10 +157,15 @@ msgstr "Wenn das wireshark-common Paket so konfiguriert wird, damit einem Nicht-
|
|||
msgid ""
|
||||
"However, on this system the wireshark group is a user group instead of being"
|
||||
" a system group, so purging wireshark-common did not remove it."
|
||||
msgstr "Auf diesem System ist die wireshark Gruppe eine Benutzergruppe anstatt einer Systemgruppe. Das Löschen von wireshark-common wird die Gruppe daher nicht entfernen."
|
||||
msgstr ""
|
||||
"Auf diesem System ist die wireshark Gruppe eine Benutzergruppe anstatt einer"
|
||||
" Systemgruppe. Das Löschen von wireshark-common wird die Gruppe daher nicht "
|
||||
"entfernen."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
#: ../templates:6001
|
||||
msgid "If the group is no longer needed, please remove it manually."
|
||||
msgstr "Wenn die Gruppe nicht mehr länger benötigt wird entfernen Sie diese bitte manuell."
|
||||
msgstr ""
|
||||
"Wenn die Gruppe nicht mehr länger benötigt wird entfernen Sie diese bitte "
|
||||
"manuell."
|
||||
|
|
|
@ -1,17 +1,20 @@
|
|||
# SOME DESCRIPTIVE TITLE.
|
||||
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
|
||||
# This file is distributed under the same license as the wireshark package.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
# Translators:
|
||||
# Francisco Javier Cuadrado <fcocuadrado@gmail.com>, 2009-2010
|
||||
# Gerald Combs <gerald@wireshark.org>, 2020
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Wireshark\n"
|
||||
"Project-Id-Version: wireshark\n"
|
||||
"Report-Msgid-Bugs-To: wireshark@packages.debian.org\n"
|
||||
"POT-Creation-Date: 2017-08-06 18:31-0400\n"
|
||||
"PO-Revision-Date: 2017-09-22 06:50+0000\n"
|
||||
"Last-Translator: Gerald Combs <gerald@wireshark.org>\n"
|
||||
"Language-Team: Spanish (http://www.transifex.com/wireshark/wireshark/language/es/)\n"
|
||||
"PO-Revision-Date: 2020-10-22 19:57+0000\n"
|
||||
"Last-Translator: Gerald Combs <gerald@wireshark.org>, 2020\n"
|
||||
"Language-Team: Spanish (https://www.transifex.com/wireshark/teams/36457/es/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
@ -22,7 +25,9 @@ msgstr ""
|
|||
#. Description
|
||||
#: ../templates:2001
|
||||
msgid "Should non-superusers be able to capture packets?"
|
||||
msgstr "¿Los usuarios sin privilegios de administración deberían poder capturar paquetes?"
|
||||
msgstr ""
|
||||
"¿Los usuarios sin privilegios de administración deberían poder capturar "
|
||||
"paquetes?"
|
||||
|
||||
#. Type: boolean
|
||||
#. Description
|
||||
|
@ -32,7 +37,11 @@ msgid ""
|
|||
"system group to capture packets. This is recommended over the alternative of"
|
||||
" running Wireshark/Tshark directly as root, because less of the code will "
|
||||
"run with elevated privileges."
|
||||
msgstr "Dumpcap se puede instalar de un modo que permite a los miembros del grupo «wireshark» capturar paquetes. Se recomienda usar esto en lugar de ejecutar Wireshark/Tshark directamente como administrador («root»), porque se ejecutará menos código con privilegios de administración."
|
||||
msgstr ""
|
||||
"Dumpcap se puede instalar de un modo que permite a los miembros del grupo "
|
||||
"«wireshark» capturar paquetes. Se recomienda usar esto en lugar de ejecutar "
|
||||
"Wireshark/Tshark directamente como administrador («root»), porque se "
|
||||
"ejecutará menos código con privilegios de administración."
|
||||
|
||||
#. Type: boolean
|
||||
#. Description
|
||||
|
@ -40,7 +49,9 @@ msgstr "Dumpcap se puede instalar de un modo que permite a los miembros del grup
|
|||
msgid ""
|
||||
"For more detailed information please see /usr/share/doc/wireshark-"
|
||||
"common/README.Debian."
|
||||
msgstr "Para más información, vea el archivo «/usr/share/doc/wireshark-common/README.Debian»."
|
||||
msgstr ""
|
||||
"Para más información, vea el archivo «/usr/share/doc/wireshark-"
|
||||
"common/README.Debian»."
|
||||
|
||||
#. Type: boolean
|
||||
#. Description
|
||||
|
@ -48,7 +59,10 @@ msgstr "Para más información, vea el archivo «/usr/share/doc/wireshark-common
|
|||
msgid ""
|
||||
"Enabling this feature may be a security risk, so it is disabled by default. "
|
||||
"If in doubt, it is suggested to leave it disabled."
|
||||
msgstr "Activar esta funcionalidad puede ser un riesgo de seguridad, por lo que de forma predeterminada está desactivada. En caso de duda, se recomienda dejarla desactivada."
|
||||
msgstr ""
|
||||
"Activar esta funcionalidad puede ser un riesgo de seguridad, por lo que de "
|
||||
"forma predeterminada está desactivada. En caso de duda, se recomienda "
|
||||
"dejarla desactivada."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
|
|
@ -1,18 +1,20 @@
|
|||
# SOME DESCRIPTIVE TITLE.
|
||||
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
|
||||
# This file is distributed under the same license as the wireshark package.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
# Translators:
|
||||
# Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>, 2010
|
||||
# Piarres Beobide <pi@beobide.net>, 2009
|
||||
# Gerald Combs <gerald@wireshark.org>, 2020
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Wireshark\n"
|
||||
"Project-Id-Version: wireshark\n"
|
||||
"Report-Msgid-Bugs-To: wireshark@packages.debian.org\n"
|
||||
"POT-Creation-Date: 2017-08-06 18:31-0400\n"
|
||||
"PO-Revision-Date: 2017-09-22 06:50+0000\n"
|
||||
"Last-Translator: Gerald Combs <gerald@wireshark.org>\n"
|
||||
"Language-Team: Basque (http://www.transifex.com/wireshark/wireshark/language/eu/)\n"
|
||||
"PO-Revision-Date: 2020-10-22 19:57+0000\n"
|
||||
"Last-Translator: Gerald Combs <gerald@wireshark.org>, 2020\n"
|
||||
"Language-Team: Basque (https://www.transifex.com/wireshark/teams/36457/eu/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
@ -23,7 +25,8 @@ msgstr ""
|
|||
#. Description
|
||||
#: ../templates:2001
|
||||
msgid "Should non-superusers be able to capture packets?"
|
||||
msgstr "Supererabiltzailea ez direnak paketeak kapturatzeko gai izan daitezke?"
|
||||
msgstr ""
|
||||
"Supererabiltzailea ez direnak paketeak kapturatzeko gai izan daitezke?"
|
||||
|
||||
#. Type: boolean
|
||||
#. Description
|
||||
|
@ -33,7 +36,11 @@ msgid ""
|
|||
"system group to capture packets. This is recommended over the alternative of"
|
||||
" running Wireshark/Tshark directly as root, because less of the code will "
|
||||
"run with elevated privileges."
|
||||
msgstr "Sistemako \"wireshark\" taldeko partaideek paketeak kapturatzea baimentzeko modu batean instala daiteke Dumpcap. Wireshark/Tshark erabiliz paketeak supererabiltzaile gisa kapturatzeko modu hau gomendatuta dago, pribilegio handiekin kode gutxiago exekutatzen da eta."
|
||||
msgstr ""
|
||||
"Sistemako \"wireshark\" taldeko partaideek paketeak kapturatzea baimentzeko "
|
||||
"modu batean instala daiteke Dumpcap. Wireshark/Tshark erabiliz paketeak "
|
||||
"supererabiltzaile gisa kapturatzeko modu hau gomendatuta dago, pribilegio "
|
||||
"handiekin kode gutxiago exekutatzen da eta."
|
||||
|
||||
#. Type: boolean
|
||||
#. Description
|
||||
|
@ -41,7 +48,9 @@ msgstr "Sistemako \"wireshark\" taldeko partaideek paketeak kapturatzea baimentz
|
|||
msgid ""
|
||||
"For more detailed information please see /usr/share/doc/wireshark-"
|
||||
"common/README.Debian."
|
||||
msgstr "Informazio gehiagorako, irakurri usr/share/doc/wireshark-common/README.Debian."
|
||||
msgstr ""
|
||||
"Informazio gehiagorako, irakurri usr/share/doc/wireshark-"
|
||||
"common/README.Debian."
|
||||
|
||||
#. Type: boolean
|
||||
#. Description
|
||||
|
@ -49,7 +58,10 @@ msgstr "Informazio gehiagorako, irakurri usr/share/doc/wireshark-common/README.D
|
|||
msgid ""
|
||||
"Enabling this feature may be a security risk, so it is disabled by default. "
|
||||
"If in doubt, it is suggested to leave it disabled."
|
||||
msgstr "Eginbide hau gaitzean segurtasuneko arrisku bat sor daiteke, hau dela eta desgaituta dago lehenespenez. Zalantzako kasuan, desgaituta uztea gomendantzen da."
|
||||
msgstr ""
|
||||
"Eginbide hau gaitzean segurtasuneko arrisku bat sor daiteke, hau dela eta "
|
||||
"desgaituta dago lehenespenez. Zalantzako kasuan, desgaituta uztea "
|
||||
"gomendantzen da."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
|
|
@ -1,18 +1,20 @@
|
|||
# SOME DESCRIPTIVE TITLE.
|
||||
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
|
||||
# This file is distributed under the same license as the wireshark package.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
# Translators:
|
||||
# edu28b5088de91f4c05 <edu@iki.fi>, 2009
|
||||
# edu28b5088de91f4c05 <edu@iki.fi>, 2009
|
||||
# Gerald Combs <gerald@wireshark.org>, 2020
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Wireshark\n"
|
||||
"Project-Id-Version: wireshark\n"
|
||||
"Report-Msgid-Bugs-To: wireshark@packages.debian.org\n"
|
||||
"POT-Creation-Date: 2017-08-06 18:31-0400\n"
|
||||
"PO-Revision-Date: 2017-09-22 06:50+0000\n"
|
||||
"Last-Translator: Gerald Combs <gerald@wireshark.org>\n"
|
||||
"Language-Team: Finnish (http://www.transifex.com/wireshark/wireshark/language/fi/)\n"
|
||||
"PO-Revision-Date: 2020-10-22 19:57+0000\n"
|
||||
"Last-Translator: Gerald Combs <gerald@wireshark.org>, 2020\n"
|
||||
"Language-Team: Finnish (https://www.transifex.com/wireshark/teams/36457/fi/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
@ -49,7 +51,10 @@ msgstr ""
|
|||
msgid ""
|
||||
"Enabling this feature may be a security risk, so it is disabled by default. "
|
||||
"If in doubt, it is suggested to leave it disabled."
|
||||
msgstr "Tämän ominaisuuden käyttöönotto saattaa olla tietoturvariski ja tästä syystä se on oletuksena poissa käytöstä. Jos olet epävarma, on suositeltavaa jättää se pois käytöstä."
|
||||
msgstr ""
|
||||
"Tämän ominaisuuden käyttöönotto saattaa olla tietoturvariski ja tästä syystä"
|
||||
" se on oletuksena poissa käytöstä. Jos olet epävarma, on suositeltavaa "
|
||||
"jättää se pois käytöstä."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
|
|
@ -1,19 +1,20 @@
|
|||
# SOME DESCRIPTIVE TITLE.
|
||||
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
|
||||
# This file is distributed under the same license as the wireshark package.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
# Translators:
|
||||
# Simon Paillard <spaillard@debian.org>, 2009
|
||||
# Yann Domingo, 2019
|
||||
# Yann Domingo, 2019
|
||||
# Gerald Combs <gerald@wireshark.org>, 2020
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Wireshark\n"
|
||||
"Project-Id-Version: wireshark\n"
|
||||
"Report-Msgid-Bugs-To: wireshark@packages.debian.org\n"
|
||||
"POT-Creation-Date: 2017-08-06 18:31-0400\n"
|
||||
"PO-Revision-Date: 2019-06-30 23:24+0000\n"
|
||||
"Last-Translator: Yann Domingo\n"
|
||||
"Language-Team: French (http://www.transifex.com/wireshark/wireshark/language/fr/)\n"
|
||||
"PO-Revision-Date: 2020-10-22 19:57+0000\n"
|
||||
"Last-Translator: Gerald Combs <gerald@wireshark.org>, 2020\n"
|
||||
"Language-Team: French (https://www.transifex.com/wireshark/teams/36457/fr/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
@ -34,7 +35,11 @@ msgid ""
|
|||
"system group to capture packets. This is recommended over the alternative of"
|
||||
" running Wireshark/Tshark directly as root, because less of the code will "
|
||||
"run with elevated privileges."
|
||||
msgstr "Dumpcap peut être installé afin d'autoriser les membres du groupe « wireshark » à capturer des paquets. Cette méthode de capture est préférable à l'exécution de Wireshark ou Tshark avec les droits du superutilisateur, car elle permet d'exécuter moins de code avec des droits importants."
|
||||
msgstr ""
|
||||
"Dumpcap peut être installé afin d'autoriser les membres du groupe « "
|
||||
"wireshark » à capturer des paquets. Cette méthode de capture est préférable "
|
||||
"à l'exécution de Wireshark ou Tshark avec les droits du superutilisateur, "
|
||||
"car elle permet d'exécuter moins de code avec des droits importants."
|
||||
|
||||
#. Type: boolean
|
||||
#. Description
|
||||
|
@ -42,7 +47,9 @@ msgstr "Dumpcap peut être installé afin d'autoriser les membres du groupe «
|
|||
msgid ""
|
||||
"For more detailed information please see /usr/share/doc/wireshark-"
|
||||
"common/README.Debian."
|
||||
msgstr "Pour plus d'information, veuillez consulter /usr/share/doc/wireshark-common/README.Debian."
|
||||
msgstr ""
|
||||
"Pour plus d'information, veuillez consulter /usr/share/doc/wireshark-"
|
||||
"common/README.Debian."
|
||||
|
||||
#. Type: boolean
|
||||
#. Description
|
||||
|
@ -50,7 +57,10 @@ msgstr "Pour plus d'information, veuillez consulter /usr/share/doc/wireshark-com
|
|||
msgid ""
|
||||
"Enabling this feature may be a security risk, so it is disabled by default. "
|
||||
"If in doubt, it is suggested to leave it disabled."
|
||||
msgstr "Cette fonctionnalité constitue un risque pour la sécurité, c'est pourquoi elle est désactivée par défaut. En cas de doute, il est suggéré de la laisser désactivée."
|
||||
msgstr ""
|
||||
"Cette fonctionnalité constitue un risque pour la sécurité, c'est pourquoi "
|
||||
"elle est désactivée par défaut. En cas de doute, il est suggéré de la "
|
||||
"laisser désactivée."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
|
|
@ -1,17 +1,20 @@
|
|||
# SOME DESCRIPTIVE TITLE.
|
||||
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
|
||||
# This file is distributed under the same license as the wireshark package.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
# Translators:
|
||||
# Balint Reczey <balint@balintreczey.hu>, 2011
|
||||
# Gerald Combs <gerald@wireshark.org>, 2020
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Wireshark\n"
|
||||
"Project-Id-Version: wireshark\n"
|
||||
"Report-Msgid-Bugs-To: wireshark@packages.debian.org\n"
|
||||
"POT-Creation-Date: 2017-08-06 18:31-0400\n"
|
||||
"PO-Revision-Date: 2017-09-22 06:50+0000\n"
|
||||
"Last-Translator: Gerald Combs <gerald@wireshark.org>\n"
|
||||
"Language-Team: Hungarian (http://www.transifex.com/wireshark/wireshark/language/hu/)\n"
|
||||
"PO-Revision-Date: 2020-10-22 19:57+0000\n"
|
||||
"Last-Translator: Gerald Combs <gerald@wireshark.org>, 2020\n"
|
||||
"Language-Team: Hungarian (https://www.transifex.com/wireshark/teams/36457/hu/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
@ -22,7 +25,9 @@ msgstr ""
|
|||
#. Description
|
||||
#: ../templates:2001
|
||||
msgid "Should non-superusers be able to capture packets?"
|
||||
msgstr "A rendszergazdán kívül más felhasználók is képesek legyenek lehallgatni ahálózati forgalmat?"
|
||||
msgstr ""
|
||||
"A rendszergazdán kívül más felhasználók is képesek legyenek lehallgatni "
|
||||
"ahálózati forgalmat?"
|
||||
|
||||
#. Type: boolean
|
||||
#. Description
|
||||
|
@ -32,7 +37,12 @@ msgid ""
|
|||
"system group to capture packets. This is recommended over the alternative of"
|
||||
" running Wireshark/Tshark directly as root, because less of the code will "
|
||||
"run with elevated privileges."
|
||||
msgstr "A dumpcap segédprogramot úgy is be lehet állítani telepítéskor, hogy lehetővétegye a \"wireshark\" rendszer-csoport tagjainak, hogy lehallgassák ahálózati forgalmat. Ez biztonságosabb, mint rendszergazdaként futtatni aWireshark/Tshark programokat, mivel kevesebb kód fut így rendszergazdaijogokkal ellátva."
|
||||
msgstr ""
|
||||
"A dumpcap segédprogramot úgy is be lehet állítani telepítéskor, hogy "
|
||||
"lehetővétegye a \"wireshark\" rendszer-csoport tagjainak, hogy lehallgassák "
|
||||
"ahálózati forgalmat. Ez biztonságosabb, mint rendszergazdaként futtatni "
|
||||
"aWireshark/Tshark programokat, mivel kevesebb kód fut így "
|
||||
"rendszergazdaijogokkal ellátva."
|
||||
|
||||
#. Type: boolean
|
||||
#. Description
|
||||
|
@ -40,7 +50,9 @@ msgstr "A dumpcap segédprogramot úgy is be lehet állítani telepítéskor, ho
|
|||
msgid ""
|
||||
"For more detailed information please see /usr/share/doc/wireshark-"
|
||||
"common/README.Debian."
|
||||
msgstr "Részletesebb információk a usr/share/doc/wireshark-common/README.Debianfájlban találhatók."
|
||||
msgstr ""
|
||||
"Részletesebb információk a usr/share/doc/wireshark-"
|
||||
"common/README.Debianfájlban találhatók."
|
||||
|
||||
#. Type: boolean
|
||||
#. Description
|
||||
|
@ -48,7 +60,9 @@ msgstr "Részletesebb információk a usr/share/doc/wireshark-common/README.Debi
|
|||
msgid ""
|
||||
"Enabling this feature may be a security risk, so it is disabled by default. "
|
||||
"If in doubt, it is suggested to leave it disabled."
|
||||
msgstr "Ennek a beállításnak az engedélyezése biztonsági kockázatot hordoz.Ha bizonytalan vagy, inkább ne engedélyezd."
|
||||
msgstr ""
|
||||
"Ennek a beállításnak az engedélyezése biztonsági kockázatot hordoz.Ha "
|
||||
"bizonytalan vagy, inkább ne engedélyezd."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
|
|
@ -1,16 +1,20 @@
|
|||
# SOME DESCRIPTIVE TITLE.
|
||||
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
|
||||
# This file is distributed under the same license as the wireshark package.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
# Translators:
|
||||
# Gerald Combs <gerald@wireshark.org>, 2020
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Wireshark\n"
|
||||
"Project-Id-Version: wireshark\n"
|
||||
"Report-Msgid-Bugs-To: wireshark@packages.debian.org\n"
|
||||
"POT-Creation-Date: 2017-08-06 18:31-0400\n"
|
||||
"PO-Revision-Date: 2017-09-22 06:50+0000\n"
|
||||
"Last-Translator: Gerald Combs <gerald@wireshark.org>\n"
|
||||
"Language-Team: Indonesian (http://www.transifex.com/wireshark/wireshark/language/id/)\n"
|
||||
"PO-Revision-Date: 2020-10-22 19:57+0000\n"
|
||||
"Last-Translator: Gerald Combs <gerald@wireshark.org>, 2020\n"
|
||||
"Language-Team: Indonesian (https://www.transifex.com/wireshark/teams/36457/id/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
@ -31,7 +35,11 @@ msgid ""
|
|||
"system group to capture packets. This is recommended over the alternative of"
|
||||
" running Wireshark/Tshark directly as root, because less of the code will "
|
||||
"run with elevated privileges."
|
||||
msgstr "Dumpcap dapat dipasang dengan cara memperbolehkan anggota dari grup system \"wireshark\" untuk menangkap paket. Hal ini dianjurkan sebagai alternatif untuk menjalankan Wireshark/Tshark sebagai root, karena sedikit kode yang berjalan dengan hak tertinggi"
|
||||
msgstr ""
|
||||
"Dumpcap dapat dipasang dengan cara memperbolehkan anggota dari grup system "
|
||||
"\"wireshark\" untuk menangkap paket. Hal ini dianjurkan sebagai alternatif "
|
||||
"untuk menjalankan Wireshark/Tshark sebagai root, karena sedikit kode yang "
|
||||
"berjalan dengan hak tertinggi"
|
||||
|
||||
#. Type: boolean
|
||||
#. Description
|
||||
|
@ -39,7 +47,9 @@ msgstr "Dumpcap dapat dipasang dengan cara memperbolehkan anggota dari grup syst
|
|||
msgid ""
|
||||
"For more detailed information please see /usr/share/doc/wireshark-"
|
||||
"common/README.Debian."
|
||||
msgstr "Untuk informasi lebih lanjut silakan lihat /usr/share/doc/wireshark-common/README.Debian."
|
||||
msgstr ""
|
||||
"Untuk informasi lebih lanjut silakan lihat /usr/share/doc/wireshark-"
|
||||
"common/README.Debian."
|
||||
|
||||
#. Type: boolean
|
||||
#. Description
|
||||
|
@ -47,7 +57,9 @@ msgstr "Untuk informasi lebih lanjut silakan lihat /usr/share/doc/wireshark-comm
|
|||
msgid ""
|
||||
"Enabling this feature may be a security risk, so it is disabled by default. "
|
||||
"If in doubt, it is suggested to leave it disabled."
|
||||
msgstr "Mengaktifkan fitur ini akan menyebabkan resiko keamanan, jadi secara bawaan akan di non-aktifkan. Jika ragu, disarankan untuk dibiarkan dinonaktifkan"
|
||||
msgstr ""
|
||||
"Mengaktifkan fitur ini akan menyebabkan resiko keamanan, jadi secara bawaan "
|
||||
"akan di non-aktifkan. Jika ragu, disarankan untuk dibiarkan dinonaktifkan"
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
|
|
@ -1,17 +1,20 @@
|
|||
# SOME DESCRIPTIVE TITLE.
|
||||
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
|
||||
# This file is distributed under the same license as the wireshark package.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
# Translators:
|
||||
# Vincenzo Reale <vinx.reale@gmail.com>, 2015,2017
|
||||
# Gerald Combs <gerald@wireshark.org>, 2020
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Wireshark\n"
|
||||
"Project-Id-Version: wireshark\n"
|
||||
"Report-Msgid-Bugs-To: wireshark@packages.debian.org\n"
|
||||
"POT-Creation-Date: 2017-08-06 18:31-0400\n"
|
||||
"PO-Revision-Date: 2017-09-22 06:50+0000\n"
|
||||
"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
|
||||
"Language-Team: Italian (http://www.transifex.com/wireshark/wireshark/language/it/)\n"
|
||||
"PO-Revision-Date: 2020-10-22 19:57+0000\n"
|
||||
"Last-Translator: Gerald Combs <gerald@wireshark.org>, 2020\n"
|
||||
"Language-Team: Italian (https://www.transifex.com/wireshark/teams/36457/it/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
@ -22,7 +25,8 @@ msgstr ""
|
|||
#. Description
|
||||
#: ../templates:2001
|
||||
msgid "Should non-superusers be able to capture packets?"
|
||||
msgstr "Vuoi consentire la cattura dei pacchetti agli utenti non privilegiati?"
|
||||
msgstr ""
|
||||
"Vuoi consentire la cattura dei pacchetti agli utenti non privilegiati?"
|
||||
|
||||
#. Type: boolean
|
||||
#. Description
|
||||
|
@ -32,7 +36,11 @@ msgid ""
|
|||
"system group to capture packets. This is recommended over the alternative of"
|
||||
" running Wireshark/Tshark directly as root, because less of the code will "
|
||||
"run with elevated privileges."
|
||||
msgstr "Dumpcap può essere installato in modo da consentire ai membri del gruppo di sistema \"wireshark\" di catturare i pacchetti. Ciò è consigliato all'alternativa di eseguire Wireshark/Tshark come root, poiché una parte minore del codice sarà eseguita con privilegi elevati."
|
||||
msgstr ""
|
||||
"Dumpcap può essere installato in modo da consentire ai membri del gruppo di "
|
||||
"sistema \"wireshark\" di catturare i pacchetti. Ciò è consigliato "
|
||||
"all'alternativa di eseguire Wireshark/Tshark come root, poiché una parte "
|
||||
"minore del codice sarà eseguita con privilegi elevati."
|
||||
|
||||
#. Type: boolean
|
||||
#. Description
|
||||
|
@ -40,7 +48,9 @@ msgstr "Dumpcap può essere installato in modo da consentire ai membri del grupp
|
|||
msgid ""
|
||||
"For more detailed information please see /usr/share/doc/wireshark-"
|
||||
"common/README.Debian."
|
||||
msgstr "Per ulteriori informazioni, vedi /usr/share/doc/wireshark-common/README.Debian."
|
||||
msgstr ""
|
||||
"Per ulteriori informazioni, vedi /usr/share/doc/wireshark-"
|
||||
"common/README.Debian."
|
||||
|
||||
#. Type: boolean
|
||||
#. Description
|
||||
|
@ -48,7 +58,10 @@ msgstr "Per ulteriori informazioni, vedi /usr/share/doc/wireshark-common/README.
|
|||
msgid ""
|
||||
"Enabling this feature may be a security risk, so it is disabled by default. "
|
||||
"If in doubt, it is suggested to leave it disabled."
|
||||
msgstr "L'abilitazione di questa funzionalità potrebbe essere un rischio per la sicurezza, perciò è disabilitata in modo predefinito. Se hai dubbi, ti consigliamo di lasciarla disabilitata."
|
||||
msgstr ""
|
||||
"L'abilitazione di questa funzionalità potrebbe essere un rischio per la "
|
||||
"sicurezza, perciò è disabilitata in modo predefinito. Se hai dubbi, ti "
|
||||
"consigliamo di lasciarla disabilitata."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
@ -62,7 +75,10 @@ msgstr "Creazione del gruppo di sistema wireshark non riuscita"
|
|||
msgid ""
|
||||
"The wireshark group does not exist, and creating it failed, so Wireshark "
|
||||
"cannot be configured to capture traffic as an unprivileged user."
|
||||
msgstr "Il gruppo wireshark non esiste, e la sua creazione non è riuscita, per cui Wireshark non può essere configurato per catturare il traffico con un utente non privilegiato."
|
||||
msgstr ""
|
||||
"Il gruppo wireshark non esiste, e la sua creazione non è riuscita, per cui "
|
||||
"Wireshark non può essere configurato per catturare il traffico con un utente"
|
||||
" non privilegiato."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
@ -70,7 +86,9 @@ msgstr "Il gruppo wireshark non esiste, e la sua creazione non è riuscita, per
|
|||
msgid ""
|
||||
"Please create the wireshark system group and try configuring wireshark-"
|
||||
"common again."
|
||||
msgstr "Crea il gruppo di sistema wireshark e prova a configurare nuovamente wireshark-common."
|
||||
msgstr ""
|
||||
"Crea il gruppo di sistema wireshark e prova a configurare nuovamente "
|
||||
"wireshark-common."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
@ -84,7 +102,9 @@ msgstr "Il gruppo wireshark è un gruppo di sistema"
|
|||
msgid ""
|
||||
"The wireshark group exists as a user group, but the preferred configuration "
|
||||
"is for it to be created as a system group."
|
||||
msgstr "Il gruppo wireshark esiste come gruppo utente, ma la configurazione preferita consiste nel crearlo come gruppo di sistema."
|
||||
msgstr ""
|
||||
"Il gruppo wireshark esiste come gruppo utente, ma la configurazione "
|
||||
"preferita consiste nel crearlo come gruppo di sistema."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
@ -92,7 +112,9 @@ msgstr "Il gruppo wireshark esiste come gruppo utente, ma la configurazione pref
|
|||
msgid ""
|
||||
"As a result, purging wireshark-common will not remove the wireshark group, "
|
||||
"but everything else should work properly."
|
||||
msgstr "Come risultato, la rimozione di wireshark-common non rimuoverà il gruppo wireshark, ma tutto il resto dovrebbe funzionare correttamente."
|
||||
msgstr ""
|
||||
"Come risultato, la rimozione di wireshark-common non rimuoverà il gruppo "
|
||||
"wireshark, ma tutto il resto dovrebbe funzionare correttamente."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
@ -106,7 +128,10 @@ msgstr "Impostazione delle capacità di dumpcap non riuscita"
|
|||
msgid ""
|
||||
"The attempt to use Linux capabilities to grant packet-capturing privileges "
|
||||
"to the dumpcap binary failed. Instead, it has had the set-user-id bit set."
|
||||
msgstr "Il tentativo di utilizzare le capacità di Linux per accordare i privilegi di cattura dei pacchetti al binario dumpcap non è riuscito. Invece, è stato impostato il bit set-user-id."
|
||||
msgstr ""
|
||||
"Il tentativo di utilizzare le capacità di Linux per accordare i privilegi di"
|
||||
" cattura dei pacchetti al binario dumpcap non è riuscito. Invece, è stato "
|
||||
"impostato il bit set-user-id."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
@ -121,7 +146,10 @@ msgid ""
|
|||
"When the wireshark-common package is configured to allow non-superusers to "
|
||||
"capture packets the postinst script of wireshark-common creates the "
|
||||
"wireshark group as a system group."
|
||||
msgstr "Quando il pacchetto wireshark-common è configurato per consentire a utenti non privilegiati di catturare pacchetti, lo script di post-installazione di wireshark-common crea un gruppo wireshark come un gruppo di sistema."
|
||||
msgstr ""
|
||||
"Quando il pacchetto wireshark-common è configurato per consentire a utenti "
|
||||
"non privilegiati di catturare pacchetti, lo script di post-installazione di "
|
||||
"wireshark-common crea un gruppo wireshark come un gruppo di sistema."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
@ -129,7 +157,10 @@ msgstr "Quando il pacchetto wireshark-common è configurato per consentire a ute
|
|||
msgid ""
|
||||
"However, on this system the wireshark group is a user group instead of being"
|
||||
" a system group, so purging wireshark-common did not remove it."
|
||||
msgstr "Tuttavia, su questo sistema il gruppo wireshark è un gruppo utente invece di essere un gruppo di sistema, per cui la rimozione di wireshark-common non lo ha rimosso."
|
||||
msgstr ""
|
||||
"Tuttavia, su questo sistema il gruppo wireshark è un gruppo utente invece di"
|
||||
" essere un gruppo di sistema, per cui la rimozione di wireshark-common non "
|
||||
"lo ha rimosso."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
|
|
@ -1,16 +1,20 @@
|
|||
# SOME DESCRIPTIVE TITLE.
|
||||
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
|
||||
# This file is distributed under the same license as the wireshark package.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
# Translators:
|
||||
# Gerald Combs <gerald@wireshark.org>, 2020
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Wireshark\n"
|
||||
"Project-Id-Version: wireshark\n"
|
||||
"Report-Msgid-Bugs-To: wireshark@packages.debian.org\n"
|
||||
"POT-Creation-Date: 2017-08-06 18:31-0400\n"
|
||||
"PO-Revision-Date: 2017-09-22 08:02+0000\n"
|
||||
"Last-Translator: Gerald Combs <gerald@wireshark.org>\n"
|
||||
"Language-Team: Japanese (http://www.transifex.com/wireshark/wireshark/language/ja/)\n"
|
||||
"PO-Revision-Date: 2020-10-22 19:57+0000\n"
|
||||
"Last-Translator: Gerald Combs <gerald@wireshark.org>, 2020\n"
|
||||
"Language-Team: Japanese (https://www.transifex.com/wireshark/teams/36457/ja/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
@ -31,7 +35,9 @@ msgid ""
|
|||
"system group to capture packets. This is recommended over the alternative of"
|
||||
" running Wireshark/Tshark directly as root, because less of the code will "
|
||||
"run with elevated privileges."
|
||||
msgstr "「wireshark」システムグループのメンバーがパケットをキャプチャできる設定で dumpcap をインストールすることができます。直接 root ユーザとして動かす別の方法と比較すると、この方が高くなった権限上で動作するコードが少なくなるのでお勧めです。"
|
||||
msgstr ""
|
||||
"「wireshark」システムグループのメンバーがパケットをキャプチャできる設定で dumpcap をインストールすることができます。直接 root "
|
||||
"ユーザとして動かす別の方法と比較すると、この方が高くなった権限上で動作するコードが少なくなるのでお勧めです。"
|
||||
|
||||
#. Type: boolean
|
||||
#. Description
|
||||
|
@ -47,7 +53,8 @@ msgstr "より詳細な情報については /usr/share/doc/wireshark-common/REA
|
|||
msgid ""
|
||||
"Enabling this feature may be a security risk, so it is disabled by default. "
|
||||
"If in doubt, it is suggested to leave it disabled."
|
||||
msgstr "この機能を有効にするのはセキュリティ上のリスクになる可能性があるので、デフォルトでは無効にされています。分からない場合は無効のままにしておくことをお勧めします。"
|
||||
msgstr ""
|
||||
"この機能を有効にするのはセキュリティ上のリスクになる可能性があるので、デフォルトでは無効にされています。分からない場合は無効のままにしておくことをお勧めします。"
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
|
|
@ -1,18 +1,20 @@
|
|||
# SOME DESCRIPTIVE TITLE.
|
||||
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
|
||||
# This file is distributed under the same license as the wireshark package.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
# Translators:
|
||||
# ks k, 2019
|
||||
# ks k, 2019
|
||||
# Gerald Combs <gerald@wireshark.org>, 2020
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Wireshark\n"
|
||||
"Project-Id-Version: wireshark\n"
|
||||
"Report-Msgid-Bugs-To: wireshark@packages.debian.org\n"
|
||||
"POT-Creation-Date: 2017-08-06 18:31-0400\n"
|
||||
"PO-Revision-Date: 2019-11-24 12:41+0000\n"
|
||||
"Last-Translator: ks k\n"
|
||||
"Language-Team: Korean (http://www.transifex.com/wireshark/wireshark/language/ko/)\n"
|
||||
"PO-Revision-Date: 2020-10-22 19:57+0000\n"
|
||||
"Last-Translator: Gerald Combs <gerald@wireshark.org>, 2020\n"
|
||||
"Language-Team: Korean (https://www.transifex.com/wireshark/teams/36457/ko/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
@ -33,7 +35,9 @@ msgid ""
|
|||
"system group to capture packets. This is recommended over the alternative of"
|
||||
" running Wireshark/Tshark directly as root, because less of the code will "
|
||||
"run with elevated privileges."
|
||||
msgstr "root로 직접 Wireshark/Tshark를 실행시키는 것의 대안으로 좀 더 적은 권한으로 패킷 갈무리를 하기위해 \"와이어샤크\" 체제 묶음의 일원인 Dumpcap이 설치될 수 있습니다."
|
||||
msgstr ""
|
||||
"root로 직접 Wireshark/Tshark를 실행시키는 것의 대안으로 좀 더 적은 권한으로 패킷 갈무리를 하기위해 \"와이어샤크\" "
|
||||
"체제 묶음의 일원인 Dumpcap이 설치될 수 있습니다."
|
||||
|
||||
#. Type: boolean
|
||||
#. Description
|
||||
|
@ -63,7 +67,8 @@ msgstr "와이어샤크 체제 묶음 작성에 실패했습니다"
|
|||
msgid ""
|
||||
"The wireshark group does not exist, and creating it failed, so Wireshark "
|
||||
"cannot be configured to capture traffic as an unprivileged user."
|
||||
msgstr "와이어샤크 묶음은 존재하지 않아 만들기에 실패하므로 와이어샤크는 권한이 없는 사용자로 트래픽을 갈무리하도록 구성할 수 없습니다."
|
||||
msgstr ""
|
||||
"와이어샤크 묶음은 존재하지 않아 만들기에 실패하므로 와이어샤크는 권한이 없는 사용자로 트래픽을 갈무리하도록 구성할 수 없습니다."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
@ -93,7 +98,8 @@ msgstr "와이어샤크 묶음은 사용자 묶음으로 존재하지만 기본
|
|||
msgid ""
|
||||
"As a result, purging wireshark-common will not remove the wireshark group, "
|
||||
"but everything else should work properly."
|
||||
msgstr "결과적으로 wireshark-common을 제거해도 와이어샤크 묶음이 제거되지는 않지만 다른 모든 기능은 제대로 작동해야합니다."
|
||||
msgstr ""
|
||||
"결과적으로 wireshark-common을 제거해도 와이어샤크 묶음이 제거되지는 않지만 다른 모든 기능은 제대로 작동해야합니다."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
@ -107,7 +113,9 @@ msgstr "덤프캡에 대한 기능 설정 실패"
|
|||
msgid ""
|
||||
"The attempt to use Linux capabilities to grant packet-capturing privileges "
|
||||
"to the dumpcap binary failed. Instead, it has had the set-user-id bit set."
|
||||
msgstr "리눅스 기능을 사용하여 덤프 갈무리 바이너리에 패킷 갈무리 권한을 부여하려는 시도가 실패했습니다. 대신 set-user-id 비트가 설정되었습니다."
|
||||
msgstr ""
|
||||
"리눅스 기능을 사용하여 덤프 갈무리 바이너리에 패킷 갈무리 권한을 부여하려는 시도가 실패했습니다. 대신 set-user-id 비트가 "
|
||||
"설정되었습니다."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
@ -122,7 +130,9 @@ msgid ""
|
|||
"When the wireshark-common package is configured to allow non-superusers to "
|
||||
"capture packets the postinst script of wireshark-common creates the "
|
||||
"wireshark group as a system group."
|
||||
msgstr "슈퍼 유저가 아닌 사용자가 패킷을 갈무리 할 수 있도록 wireshark-common 패키지를 구성하면 wireshark-common의 postinst 스크립트가 와이어샤크 묶음을 체제 묶음으로 만듭니다."
|
||||
msgstr ""
|
||||
"슈퍼 유저가 아닌 사용자가 패킷을 갈무리 할 수 있도록 wireshark-common 패키지를 구성하면 wireshark-common의 "
|
||||
"postinst 스크립트가 와이어샤크 묶음을 체제 묶음으로 만듭니다."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
@ -130,7 +140,8 @@ msgstr "슈퍼 유저가 아닌 사용자가 패킷을 갈무리 할 수 있도
|
|||
msgid ""
|
||||
"However, on this system the wireshark group is a user group instead of being"
|
||||
" a system group, so purging wireshark-common did not remove it."
|
||||
msgstr "그러나, 이 체제에서 와이어샤크 묶음은 체제 묶음이 아닌 사용자 묶음이므로 wireshark-common을 제거해도 제거되지 않았습니다."
|
||||
msgstr ""
|
||||
"그러나, 이 체제에서 와이어샤크 묶음은 체제 묶음이 아닌 사용자 묶음이므로 wireshark-common을 제거해도 제거되지 않았습니다."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
|
|
@ -1,17 +1,20 @@
|
|||
# SOME DESCRIPTIVE TITLE.
|
||||
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
|
||||
# This file is distributed under the same license as the wireshark package.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
# Translators:
|
||||
# Jeroen Schot <schot@a-eskwadraat.nl>, 2011
|
||||
# Gerald Combs <gerald@wireshark.org>, 2020
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Wireshark\n"
|
||||
"Project-Id-Version: wireshark\n"
|
||||
"Report-Msgid-Bugs-To: wireshark@packages.debian.org\n"
|
||||
"POT-Creation-Date: 2017-08-06 18:31-0400\n"
|
||||
"PO-Revision-Date: 2017-09-22 06:50+0000\n"
|
||||
"Last-Translator: Gerald Combs <gerald@wireshark.org>\n"
|
||||
"Language-Team: Dutch (http://www.transifex.com/wireshark/wireshark/language/nl/)\n"
|
||||
"PO-Revision-Date: 2020-10-22 19:57+0000\n"
|
||||
"Last-Translator: Gerald Combs <gerald@wireshark.org>, 2020\n"
|
||||
"Language-Team: Dutch (https://www.transifex.com/wireshark/teams/36457/nl/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
@ -22,7 +25,8 @@ msgstr ""
|
|||
#. Description
|
||||
#: ../templates:2001
|
||||
msgid "Should non-superusers be able to capture packets?"
|
||||
msgstr "Moet het voor niet-beheerders mogelijk zijn om pakketjes te onderscheppen?"
|
||||
msgstr ""
|
||||
"Moet het voor niet-beheerders mogelijk zijn om pakketjes te onderscheppen?"
|
||||
|
||||
#. Type: boolean
|
||||
#. Description
|
||||
|
@ -32,7 +36,11 @@ msgid ""
|
|||
"system group to capture packets. This is recommended over the alternative of"
|
||||
" running Wireshark/Tshark directly as root, because less of the code will "
|
||||
"run with elevated privileges."
|
||||
msgstr "Dumpcap kan zodanig worden geïnstalleerd dat leden van de systeemgroep \"wireshark\" netwerkpakketjes mogen onderscheppen. Dit wordt aanbevolen boven het uitvoeren van Wireshark/Tshark als beheerder, omdat op deze manier minder code met verhoogde privileges wordt uitgevoerd."
|
||||
msgstr ""
|
||||
"Dumpcap kan zodanig worden geïnstalleerd dat leden van de systeemgroep "
|
||||
"\"wireshark\" netwerkpakketjes mogen onderscheppen. Dit wordt aanbevolen "
|
||||
"boven het uitvoeren van Wireshark/Tshark als beheerder, omdat op deze "
|
||||
"manier minder code met verhoogde privileges wordt uitgevoerd."
|
||||
|
||||
#. Type: boolean
|
||||
#. Description
|
||||
|
@ -40,7 +48,9 @@ msgstr "Dumpcap kan zodanig worden geïnstalleerd dat leden van de systeemgroep
|
|||
msgid ""
|
||||
"For more detailed information please see /usr/share/doc/wireshark-"
|
||||
"common/README.Debian."
|
||||
msgstr "Uitgebreide informatie hierover is te vinden in /usr/share/doc/wireshark-common/README.Debian."
|
||||
msgstr ""
|
||||
"Uitgebreide informatie hierover is te vinden in /usr/share/doc/wireshark-"
|
||||
"common/README.Debian."
|
||||
|
||||
#. Type: boolean
|
||||
#. Description
|
||||
|
@ -48,7 +58,10 @@ msgstr "Uitgebreide informatie hierover is te vinden in /usr/share/doc/wireshark
|
|||
msgid ""
|
||||
"Enabling this feature may be a security risk, so it is disabled by default. "
|
||||
"If in doubt, it is suggested to leave it disabled."
|
||||
msgstr "Het activeren van deze functionaliteit is mogelijk een beveiligingsrisico, daarom staat dit niet standaard aan. Bij twijfel wordt u aangeraden om dit niet te activeren."
|
||||
msgstr ""
|
||||
"Het activeren van deze functionaliteit is mogelijk een beveiligingsrisico, "
|
||||
"daarom staat dit niet standaard aan. Bij twijfel wordt u aangeraden om dit "
|
||||
"niet te activeren."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
|
|
@ -1,16 +1,20 @@
|
|||
# SOME DESCRIPTIVE TITLE.
|
||||
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
|
||||
# This file is distributed under the same license as the wireshark package.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
# Translators:
|
||||
# Gerald Combs <gerald@wireshark.org>, 2020
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Wireshark\n"
|
||||
"Project-Id-Version: wireshark\n"
|
||||
"Report-Msgid-Bugs-To: wireshark@packages.debian.org\n"
|
||||
"POT-Creation-Date: 2017-08-06 18:31-0400\n"
|
||||
"PO-Revision-Date: 2017-09-22 06:50+0000\n"
|
||||
"Last-Translator: Gerald Combs <gerald@wireshark.org>\n"
|
||||
"Language-Team: Portuguese (http://www.transifex.com/wireshark/wireshark/language/pt/)\n"
|
||||
"PO-Revision-Date: 2020-10-22 19:57+0000\n"
|
||||
"Last-Translator: Gerald Combs <gerald@wireshark.org>, 2020\n"
|
||||
"Language-Team: Portuguese (https://www.transifex.com/wireshark/teams/36457/pt/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
@ -31,7 +35,11 @@ msgid ""
|
|||
"system group to capture packets. This is recommended over the alternative of"
|
||||
" running Wireshark/Tshark directly as root, because less of the code will "
|
||||
"run with elevated privileges."
|
||||
msgstr "O dumpcap pode ser instalado de maneira que os membros do grupo de sistema \"wireshark\" possam capturar pacotes. Este é o modo recomendado em vez da alternativa de correr o Wireshark/Tshark directamente como root, porque menos código será executado com privilégios elevados."
|
||||
msgstr ""
|
||||
"O dumpcap pode ser instalado de maneira que os membros do grupo de sistema "
|
||||
"\"wireshark\" possam capturar pacotes. Este é o modo recomendado em vez da "
|
||||
"alternativa de correr o Wireshark/Tshark directamente como root, porque "
|
||||
"menos código será executado com privilégios elevados."
|
||||
|
||||
#. Type: boolean
|
||||
#. Description
|
||||
|
@ -39,7 +47,9 @@ msgstr "O dumpcap pode ser instalado de maneira que os membros do grupo de siste
|
|||
msgid ""
|
||||
"For more detailed information please see /usr/share/doc/wireshark-"
|
||||
"common/README.Debian."
|
||||
msgstr "Para informação mais detalhada, leia por favor /usr/share/doc/wireshark-common/README.Debian."
|
||||
msgstr ""
|
||||
"Para informação mais detalhada, leia por favor /usr/share/doc/wireshark-"
|
||||
"common/README.Debian."
|
||||
|
||||
#. Type: boolean
|
||||
#. Description
|
||||
|
@ -47,7 +57,10 @@ msgstr "Para informação mais detalhada, leia por favor /usr/share/doc/wireshar
|
|||
msgid ""
|
||||
"Enabling this feature may be a security risk, so it is disabled by default. "
|
||||
"If in doubt, it is suggested to leave it disabled."
|
||||
msgstr "Activar esta característica pode ser um risco de segurança, por isso vem desactivada por predefinição. Em caso de dúvida, sugere-se deixá-la desactivada."
|
||||
msgstr ""
|
||||
"Activar esta característica pode ser um risco de segurança, por isso vem "
|
||||
"desactivada por predefinição. Em caso de dúvida, sugere-se deixá-la "
|
||||
"desactivada."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
|
|
@ -1,18 +1,20 @@
|
|||
# SOME DESCRIPTIVE TITLE.
|
||||
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
|
||||
# This file is distributed under the same license as the wireshark package.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
# Translators:
|
||||
# Adriano Rafael Gomes <adrianorg@gmail.com>, 2010
|
||||
# Rafael Henrique da Silva Correia <rafaelhenriqu@gmail.com>, 2009
|
||||
# Gerald Combs <gerald@wireshark.org>, 2020
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Wireshark\n"
|
||||
"Project-Id-Version: wireshark\n"
|
||||
"Report-Msgid-Bugs-To: wireshark@packages.debian.org\n"
|
||||
"POT-Creation-Date: 2017-08-06 18:31-0400\n"
|
||||
"PO-Revision-Date: 2017-09-22 06:50+0000\n"
|
||||
"Last-Translator: Gerald Combs <gerald@wireshark.org>\n"
|
||||
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/wireshark/wireshark/language/pt_BR/)\n"
|
||||
"PO-Revision-Date: 2020-10-22 19:57+0000\n"
|
||||
"Last-Translator: Gerald Combs <gerald@wireshark.org>, 2020\n"
|
||||
"Language-Team: Portuguese (Brazil) (https://www.transifex.com/wireshark/teams/36457/pt_BR/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
@ -33,7 +35,11 @@ msgid ""
|
|||
"system group to capture packets. This is recommended over the alternative of"
|
||||
" running Wireshark/Tshark directly as root, because less of the code will "
|
||||
"run with elevated privileges."
|
||||
msgstr "O dumpcap pode ser instalado em um modo que permite a membros do grupo de sistema \"wireshark\" capturar pacotes. Isto é recomendado em vez da alternativa de executar o Wireshark/Tshark diretamente como root, porque menos código será executado com privilégios elevados."
|
||||
msgstr ""
|
||||
"O dumpcap pode ser instalado em um modo que permite a membros do grupo de "
|
||||
"sistema \"wireshark\" capturar pacotes. Isto é recomendado em vez da "
|
||||
"alternativa de executar o Wireshark/Tshark diretamente como root, porque "
|
||||
"menos código será executado com privilégios elevados."
|
||||
|
||||
#. Type: boolean
|
||||
#. Description
|
||||
|
@ -41,7 +47,9 @@ msgstr "O dumpcap pode ser instalado em um modo que permite a membros do grupo d
|
|||
msgid ""
|
||||
"For more detailed information please see /usr/share/doc/wireshark-"
|
||||
"common/README.Debian."
|
||||
msgstr "Para informações mais detalhadas, por favor veja /usr/share/doc/wireshark-common/README.Debian."
|
||||
msgstr ""
|
||||
"Para informações mais detalhadas, por favor veja /usr/share/doc/wireshark-"
|
||||
"common/README.Debian."
|
||||
|
||||
#. Type: boolean
|
||||
#. Description
|
||||
|
@ -49,7 +57,10 @@ msgstr "Para informações mais detalhadas, por favor veja /usr/share/doc/wiresh
|
|||
msgid ""
|
||||
"Enabling this feature may be a security risk, so it is disabled by default. "
|
||||
"If in doubt, it is suggested to leave it disabled."
|
||||
msgstr "Habilitar este recurso pode ser um risco de segurança, portanto ele é desabilitado por padrão. Se estiver em dúvida, é sugerido deixá-lo desabilitado."
|
||||
msgstr ""
|
||||
"Habilitar este recurso pode ser um risco de segurança, portanto ele é "
|
||||
"desabilitado por padrão. Se estiver em dúvida, é sugerido deixá-lo "
|
||||
"desabilitado."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
|
|
@ -1,18 +1,20 @@
|
|||
# SOME DESCRIPTIVE TITLE.
|
||||
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
|
||||
# This file is distributed under the same license as the wireshark package.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
# Translators:
|
||||
# Vladlen Shapo <vladlen.shapo@gmail.com>, 2017
|
||||
# Yuri Kozlov <yuray@komyakino.ru>, 2009-2010
|
||||
# Gerald Combs <gerald@wireshark.org>, 2020
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Wireshark\n"
|
||||
"Project-Id-Version: wireshark\n"
|
||||
"Report-Msgid-Bugs-To: wireshark@packages.debian.org\n"
|
||||
"POT-Creation-Date: 2017-08-06 18:31-0400\n"
|
||||
"PO-Revision-Date: 2017-11-23 18:24+0000\n"
|
||||
"Last-Translator: Vladlen Shapo <vladlen.shapo@gmail.com>\n"
|
||||
"Language-Team: Russian (http://www.transifex.com/wireshark/wireshark/language/ru/)\n"
|
||||
"PO-Revision-Date: 2020-10-22 19:57+0000\n"
|
||||
"Last-Translator: Gerald Combs <gerald@wireshark.org>, 2020\n"
|
||||
"Language-Team: Russian (https://www.transifex.com/wireshark/teams/36457/ru/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
@ -33,7 +35,11 @@ msgid ""
|
|||
"system group to capture packets. This is recommended over the alternative of"
|
||||
" running Wireshark/Tshark directly as root, because less of the code will "
|
||||
"run with elevated privileges."
|
||||
msgstr "Dumpcap можно установить таким образом, что члены группы wireshark смогут захватывать пакеты. Это более рекомендуемый способ захвата пакетов с помощью Wireshark/Tshark, чем запуск самого Wireshark/Tshark с правами root, так как это позволяет выполнять почти весь код с меньшими правами."
|
||||
msgstr ""
|
||||
"Dumpcap можно установить таким образом, что члены группы wireshark смогут "
|
||||
"захватывать пакеты. Это более рекомендуемый способ захвата пакетов с помощью"
|
||||
" Wireshark/Tshark, чем запуск самого Wireshark/Tshark с правами root, так "
|
||||
"как это позволяет выполнять почти весь код с меньшими правами."
|
||||
|
||||
#. Type: boolean
|
||||
#. Description
|
||||
|
@ -41,7 +47,9 @@ msgstr "Dumpcap можно установить таким образом, чт
|
|||
msgid ""
|
||||
"For more detailed information please see /usr/share/doc/wireshark-"
|
||||
"common/README.Debian."
|
||||
msgstr "Дополнительную информацию можно найти в файле /usr/share/doc/wireshark-common/README.Debian."
|
||||
msgstr ""
|
||||
"Дополнительную информацию можно найти в файле /usr/share/doc/wireshark-"
|
||||
"common/README.Debian."
|
||||
|
||||
#. Type: boolean
|
||||
#. Description
|
||||
|
@ -49,7 +57,9 @@ msgstr "Дополнительную информацию можно найти
|
|||
msgid ""
|
||||
"Enabling this feature may be a security risk, so it is disabled by default. "
|
||||
"If in doubt, it is suggested to leave it disabled."
|
||||
msgstr "Использование данной возможности влияет на безопасность, поэтому по умолчанию не используется. Если сомневаетесь, то оставьте выключенной."
|
||||
msgstr ""
|
||||
"Использование данной возможности влияет на безопасность, поэтому по "
|
||||
"умолчанию не используется. Если сомневаетесь, то оставьте выключенной."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
@ -63,7 +73,10 @@ msgstr "Создание системной группы wireshark не выпо
|
|||
msgid ""
|
||||
"The wireshark group does not exist, and creating it failed, so Wireshark "
|
||||
"cannot be configured to capture traffic as an unprivileged user."
|
||||
msgstr "Группа wireshark не существует, её создание не выполнено, поэтому Wireshark не может быть сконфигурирован для захвата трафика в качестве непривилегированного пользователя."
|
||||
msgstr ""
|
||||
"Группа wireshark не существует, её создание не выполнено, поэтому Wireshark "
|
||||
"не может быть сконфигурирован для захвата трафика в качестве "
|
||||
"непривилегированного пользователя."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
@ -71,7 +84,9 @@ msgstr "Группа wireshark не существует, её создание
|
|||
msgid ""
|
||||
"Please create the wireshark system group and try configuring wireshark-"
|
||||
"common again."
|
||||
msgstr "Пожалуйста, создайте системную группу wireshark и попробуйте вновь выполнить конфигурирование wireshark-common. "
|
||||
msgstr ""
|
||||
"Пожалуйста, создайте системную группу wireshark и попробуйте вновь выполнить"
|
||||
" конфигурирование wireshark-common. "
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
@ -85,7 +100,9 @@ msgstr "Группа wireshark является системной группо
|
|||
msgid ""
|
||||
"The wireshark group exists as a user group, but the preferred configuration "
|
||||
"is for it to be created as a system group."
|
||||
msgstr "Группа wireshark существует как пользовательская группа, но предпочтительная конфигурация для неё - быть созданной в качестве системной группы."
|
||||
msgstr ""
|
||||
"Группа wireshark существует как пользовательская группа, но предпочтительная"
|
||||
" конфигурация для неё - быть созданной в качестве системной группы."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
@ -93,7 +110,9 @@ msgstr "Группа wireshark существует как пользовате
|
|||
msgid ""
|
||||
"As a result, purging wireshark-common will not remove the wireshark group, "
|
||||
"but everything else should work properly."
|
||||
msgstr "Как результат, очистка wireshark-common не удалит группу wireshark, но всё остальное должно работать правильно."
|
||||
msgstr ""
|
||||
"Как результат, очистка wireshark-common не удалит группу wireshark, но всё "
|
||||
"остальное должно работать правильно."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
@ -107,7 +126,10 @@ msgstr "Установка возможностей для dumpcap законч
|
|||
msgid ""
|
||||
"The attempt to use Linux capabilities to grant packet-capturing privileges "
|
||||
"to the dumpcap binary failed. Instead, it has had the set-user-id bit set."
|
||||
msgstr "Попытка использовать возможности Linux для присвоения привилегий для захвата пакетов двоичному dumpcap закончилась ошибкой. Однако был установлен бит идентификации пользователя set-user-id ."
|
||||
msgstr ""
|
||||
"Попытка использовать возможности Linux для присвоения привилегий для захвата"
|
||||
" пакетов двоичному dumpcap закончилась ошибкой. Однако был установлен бит "
|
||||
"идентификации пользователя set-user-id ."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
@ -122,7 +144,10 @@ msgid ""
|
|||
"When the wireshark-common package is configured to allow non-superusers to "
|
||||
"capture packets the postinst script of wireshark-common creates the "
|
||||
"wireshark group as a system group."
|
||||
msgstr "Когда пакет wireshark-common сконфигурирован так, чтобы позволить не суперпользователям захватывать пакеты, скрипт postinst в wireshark-common создаёт группу wireshark как системную группу."
|
||||
msgstr ""
|
||||
"Когда пакет wireshark-common сконфигурирован так, чтобы позволить не "
|
||||
"суперпользователям захватывать пакеты, скрипт postinst в wireshark-common "
|
||||
"создаёт группу wireshark как системную группу."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
@ -130,7 +155,10 @@ msgstr "Когда пакет wireshark-common сконфигурирован т
|
|||
msgid ""
|
||||
"However, on this system the wireshark group is a user group instead of being"
|
||||
" a system group, so purging wireshark-common did not remove it."
|
||||
msgstr "Однако в этой системе группа wireshark - пользовательская группа, вместо того, чтобы быть системной группой, поэтому очистка wireshark-common не удалит её."
|
||||
msgstr ""
|
||||
"Однако в этой системе группа wireshark - пользовательская группа, вместо "
|
||||
"того, чтобы быть системной группой, поэтому очистка wireshark-common не "
|
||||
"удалит её."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
|
|
@ -1,18 +1,20 @@
|
|||
# SOME DESCRIPTIVE TITLE.
|
||||
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
|
||||
# This file is distributed under the same license as the wireshark package.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
# Translators:
|
||||
# Automatically generated, 2011
|
||||
# Slavko <linux@slavino.sk>, 2011
|
||||
# Gerald Combs <gerald@wireshark.org>, 2020
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Wireshark\n"
|
||||
"Project-Id-Version: wireshark\n"
|
||||
"Report-Msgid-Bugs-To: wireshark@packages.debian.org\n"
|
||||
"POT-Creation-Date: 2017-08-06 18:31-0400\n"
|
||||
"PO-Revision-Date: 2017-09-22 06:50+0000\n"
|
||||
"Last-Translator: Gerald Combs <gerald@wireshark.org>\n"
|
||||
"Language-Team: Slovak (http://www.transifex.com/wireshark/wireshark/language/sk/)\n"
|
||||
"PO-Revision-Date: 2020-10-22 19:57+0000\n"
|
||||
"Last-Translator: Gerald Combs <gerald@wireshark.org>, 2020\n"
|
||||
"Language-Team: Slovak (https://www.transifex.com/wireshark/teams/36457/sk/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
@ -33,7 +35,11 @@ msgid ""
|
|||
"system group to capture packets. This is recommended over the alternative of"
|
||||
" running Wireshark/Tshark directly as root, because less of the code will "
|
||||
"run with elevated privileges."
|
||||
msgstr "Dumpcap možno nainštalovať spôsobom, ktorý dovolí zachytávať pakety členom systémovej skupiny „wireshark”. Toto je odporúčané oproti alternatívnemu spúšťaniu Wireshark/Tshark priamo s právami root, pretože bude menej kódu bežať s neobmedzenými právami."
|
||||
msgstr ""
|
||||
"Dumpcap možno nainštalovať spôsobom, ktorý dovolí zachytávať pakety členom "
|
||||
"systémovej skupiny „wireshark”. Toto je odporúčané oproti alternatívnemu "
|
||||
"spúšťaniu Wireshark/Tshark priamo s právami root, pretože bude menej kódu "
|
||||
"bežať s neobmedzenými právami."
|
||||
|
||||
#. Type: boolean
|
||||
#. Description
|
||||
|
@ -41,7 +47,9 @@ msgstr "Dumpcap možno nainštalovať spôsobom, ktorý dovolí zachytávať pak
|
|||
msgid ""
|
||||
"For more detailed information please see /usr/share/doc/wireshark-"
|
||||
"common/README.Debian."
|
||||
msgstr "Ďalšie, podrobnejšie informácie nájdete v /usr/share/doc/wireshark-common/README.Debian."
|
||||
msgstr ""
|
||||
"Ďalšie, podrobnejšie informácie nájdete v /usr/share/doc/wireshark-"
|
||||
"common/README.Debian."
|
||||
|
||||
#. Type: boolean
|
||||
#. Description
|
||||
|
@ -49,7 +57,9 @@ msgstr "Ďalšie, podrobnejšie informácie nájdete v /usr/share/doc/wireshark-
|
|||
msgid ""
|
||||
"Enabling this feature may be a security risk, so it is disabled by default. "
|
||||
"If in doubt, it is suggested to leave it disabled."
|
||||
msgstr "Zapnutie tejto vlastnosti môže byť bezpečnostným rizikom, aj preto je predvolene vypnutá. Ak si nie ste istý, odporúčame ponechať ju vypnutú."
|
||||
msgstr ""
|
||||
"Zapnutie tejto vlastnosti môže byť bezpečnostným rizikom, aj preto je "
|
||||
"predvolene vypnutá. Ak si nie ste istý, odporúčame ponechať ju vypnutú."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
|
|
@ -1,18 +1,20 @@
|
|||
# SOME DESCRIPTIVE TITLE.
|
||||
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
|
||||
# This file is distributed under the same license as the wireshark package.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
# Translators:
|
||||
# Göran Uddeborg <goeran@uddeborg.se>, 2017
|
||||
# Martin Ågren <martin.agren@gmail.com>, 2009-2010
|
||||
# Gerald Combs <gerald@wireshark.org>, 2020
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Wireshark\n"
|
||||
"Project-Id-Version: wireshark\n"
|
||||
"Report-Msgid-Bugs-To: wireshark@packages.debian.org\n"
|
||||
"POT-Creation-Date: 2017-08-06 18:31-0400\n"
|
||||
"PO-Revision-Date: 2017-11-27 22:17+0000\n"
|
||||
"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
|
||||
"Language-Team: Swedish (http://www.transifex.com/wireshark/wireshark/language/sv/)\n"
|
||||
"PO-Revision-Date: 2020-10-22 19:57+0000\n"
|
||||
"Last-Translator: Gerald Combs <gerald@wireshark.org>, 2020\n"
|
||||
"Language-Team: Swedish (https://www.transifex.com/wireshark/teams/36457/sv/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
@ -33,7 +35,11 @@ msgid ""
|
|||
"system group to capture packets. This is recommended over the alternative of"
|
||||
" running Wireshark/Tshark directly as root, because less of the code will "
|
||||
"run with elevated privileges."
|
||||
msgstr "Dumpcap kan installeras på ett sätt som tillåter medlemmar i systemgruppen \"wireshark\" att fånga paket. Detta rekommenderas framför alternativet, att köra Wireshark/Tshark direkt som root, eftersom en mindre del av koden kommer köras med utökade rättigheter."
|
||||
msgstr ""
|
||||
"Dumpcap kan installeras på ett sätt som tillåter medlemmar i systemgruppen "
|
||||
"\"wireshark\" att fånga paket. Detta rekommenderas framför alternativet, att"
|
||||
" köra Wireshark/Tshark direkt som root, eftersom en mindre del av koden "
|
||||
"kommer köras med utökade rättigheter."
|
||||
|
||||
#. Type: boolean
|
||||
#. Description
|
||||
|
@ -41,7 +47,9 @@ msgstr "Dumpcap kan installeras på ett sätt som tillåter medlemmar i systemgr
|
|||
msgid ""
|
||||
"For more detailed information please see /usr/share/doc/wireshark-"
|
||||
"common/README.Debian."
|
||||
msgstr "Se /usr/share/doc/wireshark-common/README.Debian för mer detaljerad information."
|
||||
msgstr ""
|
||||
"Se /usr/share/doc/wireshark-common/README.Debian för mer detaljerad "
|
||||
"information."
|
||||
|
||||
#. Type: boolean
|
||||
#. Description
|
||||
|
@ -49,7 +57,9 @@ msgstr "Se /usr/share/doc/wireshark-common/README.Debian för mer detaljerad inf
|
|||
msgid ""
|
||||
"Enabling this feature may be a security risk, so it is disabled by default. "
|
||||
"If in doubt, it is suggested to leave it disabled."
|
||||
msgstr "Att aktivera denna funktion kan vara en säkerhetsrisk, så den är avaktiverad som standard. Vid tvivel rekommenderas att den lämnas avaktiverad."
|
||||
msgstr ""
|
||||
"Att aktivera denna funktion kan vara en säkerhetsrisk, så den är avaktiverad"
|
||||
" som standard. Vid tvivel rekommenderas att den lämnas avaktiverad."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
@ -63,7 +73,9 @@ msgstr "Att skapa systemgruppen wireshark misslyckades"
|
|||
msgid ""
|
||||
"The wireshark group does not exist, and creating it failed, so Wireshark "
|
||||
"cannot be configured to capture traffic as an unprivileged user."
|
||||
msgstr "Gruppen wireshark finns inte, och att skapa den misslyckades, så Wireshark kan inte konfigureras att fånga trafik som en opriviligierad användare."
|
||||
msgstr ""
|
||||
"Gruppen wireshark finns inte, och att skapa den misslyckades, så Wireshark "
|
||||
"kan inte konfigureras att fånga trafik som en opriviligierad användare."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
@ -71,7 +83,8 @@ msgstr "Gruppen wireshark finns inte, och att skapa den misslyckades, så Wiresh
|
|||
msgid ""
|
||||
"Please create the wireshark system group and try configuring wireshark-"
|
||||
"common again."
|
||||
msgstr "Skapa systemgruppen wireshark och försök konfigurera wireshark-common igen."
|
||||
msgstr ""
|
||||
"Skapa systemgruppen wireshark och försök konfigurera wireshark-common igen."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
@ -85,7 +98,9 @@ msgstr "Gruppen wireshark är en systemgrupp"
|
|||
msgid ""
|
||||
"The wireshark group exists as a user group, but the preferred configuration "
|
||||
"is for it to be created as a system group."
|
||||
msgstr "Gruppen wireshark finns som en användargrupp, men den rekommenderade konfigurationen är att den skapas som sen systemgrupp."
|
||||
msgstr ""
|
||||
"Gruppen wireshark finns som en användargrupp, men den rekommenderade "
|
||||
"konfigurationen är att den skapas som sen systemgrupp."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
@ -93,7 +108,9 @@ msgstr "Gruppen wireshark finns som en användargrupp, men den rekommenderade ko
|
|||
msgid ""
|
||||
"As a result, purging wireshark-common will not remove the wireshark group, "
|
||||
"but everything else should work properly."
|
||||
msgstr "Som ett resultat kommer rensning av wireshark-common inte ta bort gruppen wireshark, men allt annat skall fungera normalt."
|
||||
msgstr ""
|
||||
"Som ett resultat kommer rensning av wireshark-common inte ta bort gruppen "
|
||||
"wireshark, men allt annat skall fungera normalt."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
@ -107,7 +124,10 @@ msgstr "Att sätta förmågor för dumpcap misslyckades"
|
|||
msgid ""
|
||||
"The attempt to use Linux capabilities to grant packet-capturing privileges "
|
||||
"to the dumpcap binary failed. Instead, it has had the set-user-id bit set."
|
||||
msgstr "Försöket att använda Linux förmågor (capabilities) för att ge rättigheter att fånga paket till programmet dumpcap misslyckades. Istället har det fått set-user-id-biten satt."
|
||||
msgstr ""
|
||||
"Försöket att använda Linux förmågor (capabilities) för att ge rättigheter "
|
||||
"att fånga paket till programmet dumpcap misslyckades. Istället har det fått"
|
||||
" set-user-id-biten satt."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
@ -122,7 +142,10 @@ msgid ""
|
|||
"When the wireshark-common package is configured to allow non-superusers to "
|
||||
"capture packets the postinst script of wireshark-common creates the "
|
||||
"wireshark group as a system group."
|
||||
msgstr "När paketet wireshark-common är konfigurerat för att tillåta andra än superanvändaren att fånga paket skapara postinst-skriptet i wireshark-common gruppen wireshark som en systemgrupp."
|
||||
msgstr ""
|
||||
"När paketet wireshark-common är konfigurerat för att tillåta andra än "
|
||||
"superanvändaren att fånga paket skapara postinst-skriptet i wireshark-common"
|
||||
" gruppen wireshark som en systemgrupp."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
@ -130,7 +153,9 @@ msgstr "När paketet wireshark-common är konfigurerat för att tillåta andra
|
|||
msgid ""
|
||||
"However, on this system the wireshark group is a user group instead of being"
|
||||
" a system group, so purging wireshark-common did not remove it."
|
||||
msgstr "Dock är gruppen wireshark en användargrupp på detta system istället för en systemgrupp, så att rensa bort wireshark-common tog inte bort den."
|
||||
msgstr ""
|
||||
"Dock är gruppen wireshark en användargrupp på detta system istället för en "
|
||||
"systemgrupp, så att rensa bort wireshark-common tog inte bort den."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
|
|
@ -1,16 +1,20 @@
|
|||
# SOME DESCRIPTIVE TITLE.
|
||||
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
|
||||
# This file is distributed under the same license as the wireshark package.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
# Translators:
|
||||
# Gerald Combs <gerald@wireshark.org>, 2020
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Wireshark\n"
|
||||
"Project-Id-Version: wireshark\n"
|
||||
"Report-Msgid-Bugs-To: wireshark@packages.debian.org\n"
|
||||
"POT-Creation-Date: 2017-08-06 18:31-0400\n"
|
||||
"PO-Revision-Date: 2017-09-22 06:50+0000\n"
|
||||
"Last-Translator: Gerald Combs <gerald@wireshark.org>\n"
|
||||
"Language-Team: Vietnamese (http://www.transifex.com/wireshark/wireshark/language/vi/)\n"
|
||||
"PO-Revision-Date: 2020-10-22 19:57+0000\n"
|
||||
"Last-Translator: Gerald Combs <gerald@wireshark.org>, 2020\n"
|
||||
"Language-Team: Vietnamese (https://www.transifex.com/wireshark/teams/36457/vi/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
@ -31,7 +35,11 @@ msgid ""
|
|||
"system group to capture packets. This is recommended over the alternative of"
|
||||
" running Wireshark/Tshark directly as root, because less of the code will "
|
||||
"run with elevated privileges."
|
||||
msgstr "Dumpcap có thể được cài đặt bằng một cách cấp cho các thành viên của nhóm « wireshark » có quyền bắt gói tin. Thiết lập này khuyến khích, so với chạy Wireshark/Tshark trực tiếp dưới người chủ, vì ít mã nguồn hơn sẽ chạy với quyền truy cập cao."
|
||||
msgstr ""
|
||||
"Dumpcap có thể được cài đặt bằng một cách cấp cho các thành viên của nhóm « "
|
||||
"wireshark » có quyền bắt gói tin. Thiết lập này khuyến khích, so với chạy "
|
||||
"Wireshark/Tshark trực tiếp dưới người chủ, vì ít mã nguồn hơn sẽ chạy với "
|
||||
"quyền truy cập cao."
|
||||
|
||||
#. Type: boolean
|
||||
#. Description
|
||||
|
@ -39,7 +47,9 @@ msgstr "Dumpcap có thể được cài đặt bằng một cách cấp cho các
|
|||
msgid ""
|
||||
"For more detailed information please see /usr/share/doc/wireshark-"
|
||||
"common/README.Debian."
|
||||
msgstr "Để tìm chi tiết, xem tài liệu Đọc Đi « /usr/share/doc/wireshark-common/README.Debian »."
|
||||
msgstr ""
|
||||
"Để tìm chi tiết, xem tài liệu Đọc Đi « /usr/share/doc/wireshark-"
|
||||
"common/README.Debian »."
|
||||
|
||||
#. Type: boolean
|
||||
#. Description
|
||||
|
@ -47,7 +57,9 @@ msgstr "Để tìm chi tiết, xem tài liệu Đọc Đi « /usr/share/doc/wire
|
|||
msgid ""
|
||||
"Enabling this feature may be a security risk, so it is disabled by default. "
|
||||
"If in doubt, it is suggested to leave it disabled."
|
||||
msgstr "Bật tính năng này có thể rủi ro bảo mật thì nó bị tắt theo mặc định. Chưa chắc nên để lại bị tắt."
|
||||
msgstr ""
|
||||
"Bật tính năng này có thể rủi ro bảo mật thì nó bị tắt theo mặc định. Chưa "
|
||||
"chắc nên để lại bị tắt."
|
||||
|
||||
#. Type: error
|
||||
#. Description
|
||||
|
|
|
@ -3398,7 +3398,7 @@ dissect_PROTO_tcp when the reassembly is complete and from
|
|||
dissect_PROTO_udp (or dissect_PROTO_other).
|
||||
|
||||
To register the distinct dissector functions, consider the following
|
||||
example, stolen from packet-dns.c:
|
||||
example, stolen from packet-hartip.c:
|
||||
|
||||
#include "packet-tcp.h"
|
||||
|
||||
|
|
|
@ -94,7 +94,7 @@ fills up, B<Dumpcap> will switch writing to the next file and so on.
|
|||
|
||||
The created filenames are based on the filename given with the B<-w> option,
|
||||
the number of the file and on the creation date and time,
|
||||
e.g. outfile_00001_20200714120117.pcap, outfile_00002_20200714120523.pcap, ...
|
||||
e.g. outfile_00001_20210714120117.pcap, outfile_00002_20210714120523.pcap, ...
|
||||
|
||||
With the I<files> option it's also possible to form a "ring buffer".
|
||||
This will fill up new files until the number of files specified,
|
||||
|
|
|
@ -150,17 +150,34 @@ This setting is mandatory.
|
|||
|
||||
=head1 EXAMPLES
|
||||
|
||||
To merge two capture files together, 100 seconds apart use:
|
||||
To merge two capture files together into a third capture file, in which
|
||||
the last packet of one file arrives 100 seconds before the first packet
|
||||
of another file, use the following sequence of commands.
|
||||
|
||||
First, use:
|
||||
|
||||
capinfos -aeS a.pcap b.pcap
|
||||
|
||||
(Let's suppose a.pcap starts at 1009932757 and b.pcap ends
|
||||
at 873660281. 1009932757 - 873660281 - 100 = 136272376
|
||||
seconds.)
|
||||
to determine the start and end times of the two capture files, as
|
||||
seconds since January 1, 1970, 00:00:00 UTC.
|
||||
|
||||
If a.pcap starts at 1009932757 and b.pcap ends at 873660281, then the
|
||||
time adjustment to b.pcap that would make it end 100 seconds before
|
||||
a.pcap begins would be 1009932757 - 873660281 - 100 = 136272376 seconds.
|
||||
|
||||
Thus, the next step would be to use:
|
||||
|
||||
editcap -t 136272376 b.pcap b-shifted.pcap
|
||||
|
||||
to generate a version of b.pcap with its time stamps shifted 136272376
|
||||
ahead.
|
||||
|
||||
Then the final step would be to use :
|
||||
|
||||
mergecap -w compare.pcap a.pcap b-shifted.pcap
|
||||
|
||||
to merge a.pcap and the shifted b.pcap into compare.pcap.
|
||||
|
||||
=head1 SEE ALSO
|
||||
|
||||
pcap(3), wireshark(1), tshark(1), dumpcap(1), editcap(1), text2pcap(1),
|
||||
|
|
|
@ -189,7 +189,7 @@ fills up, B<TShark> will switch writing to the next file and so on.
|
|||
|
||||
The created filenames are based on the filename given with the B<-w> option,
|
||||
the number of the file and on the creation date and time,
|
||||
e.g. outfile_00001_20200714120117.pcap, outfile_00002_20200714120523.pcap, ...
|
||||
e.g. outfile_00001_20210714120117.pcap, outfile_00002_20210714120523.pcap, ...
|
||||
|
||||
With the I<files> option it's also possible to form a "ring buffer".
|
||||
This will fill up new files until the number of files specified,
|
||||
|
@ -865,10 +865,11 @@ B<hms> for hours, minutes and seconds
|
|||
|
||||
=item -U E<lt>tap nameE<gt>
|
||||
|
||||
PDUs export, exports PDUs from infile to outfile according to the tap name given.
|
||||
Use -Y to filter.
|
||||
PDUs export, exports PDUs from infile to outfile according to the tap
|
||||
name given. Use -Y to filter.
|
||||
|
||||
Enter an empty tap name "" to get a list of available names.
|
||||
Enter an empty tap name "" or a tap name of ? to get a list of available
|
||||
names.
|
||||
|
||||
=item -v|--version
|
||||
|
||||
|
|
|
@ -223,7 +223,7 @@ fills up, B<Wireshark> will switch writing to the next file and so on.
|
|||
|
||||
The created filenames are based on the filename given with the B<-w> flag,
|
||||
the number of the file and on the creation date and time,
|
||||
e.g. outfile_00001_20200714120117.pcap, outfile_00002_20200714120523.pcap, ...
|
||||
e.g. outfile_00001_20210714120117.pcap, outfile_00002_20210714120523.pcap, ...
|
||||
|
||||
With the I<files> option it's also possible to form a "ring buffer".
|
||||
This will fill up new files until the number of files specified,
|
||||
|
@ -1020,7 +1020,7 @@ which to save it.
|
|||
Show a dialog box that lists all files of the file set matching the currently
|
||||
loaded file. A file set is a compound of files resulting from a capture using
|
||||
the "multiple files" / "ringbuffer" mode, recognizable by the filename pattern,
|
||||
e.g.: Filename_00001_20200714101530.pcap.
|
||||
e.g.: Filename_00001_20210714101530.pcap.
|
||||
|
||||
=item File:File Set:Next File
|
||||
|
||||
|
|
|
@ -323,6 +323,7 @@ set(WSLUA_MODULES
|
|||
${CMAKE_SOURCE_DIR}/epan/wslua/wslua_frame_info.c
|
||||
${CMAKE_SOURCE_DIR}/epan/wslua/wslua_capture_info.c
|
||||
${CMAKE_SOURCE_DIR}/epan/wslua/wslua_dir.c
|
||||
${CMAKE_SOURCE_DIR}/epan/wslua/wslua_wtap.c
|
||||
${CMAKE_SOURCE_DIR}/epan/wslua/wslua_util.c
|
||||
${CMAKE_SOURCE_DIR}/epan/wslua/wslua_struct.c
|
||||
)
|
||||
|
|
|
@ -3,7 +3,8 @@ require 'asciidoctor/extensions' unless RUBY_ENGINE == 'opal'
|
|||
|
||||
include ::Asciidoctor
|
||||
|
||||
# An inline macro that generates links to related man pages.
|
||||
# An inline macro that generates a link to a CVE Record identified by its CVE
|
||||
# Number.
|
||||
#
|
||||
# Usage
|
||||
#
|
||||
|
|
|
@ -1,13 +1,13 @@
|
|||
# SPDX-License-Identifier: MIT
|
||||
module WsUtils
|
||||
def create_doc_links(parent, target, text)
|
||||
if parent.document.basebackend? 'html'
|
||||
if (parent.document.basebackend? 'docbook') || (parent.document.basebackend? 'html')
|
||||
parent.document.register :links, target
|
||||
create_anchor(parent, text, type: :link, target: target).render.to_s
|
||||
elsif parent.document.backend == 'manpage'
|
||||
"\\fB#{text}"
|
||||
else
|
||||
bugtext
|
||||
text
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -3,12 +3,12 @@ require 'asciidoctor/extensions' unless RUBY_ENGINE == 'opal'
|
|||
|
||||
include ::Asciidoctor
|
||||
|
||||
# An inline macro that generates links to related man pages.
|
||||
# An inline macro that generates a link to a Wireshark bug report.
|
||||
#
|
||||
# Usage
|
||||
#
|
||||
# wsbuglink:<number>[<bug text>]
|
||||
# Default bug text is "Bug".
|
||||
# wsbuglink:<number>[<issue text>]
|
||||
# Default bug text is "Issue <number>".
|
||||
#
|
||||
class WSBugLinkInlineMacro < Extensions::InlineMacroProcessor
|
||||
include WsUtils
|
||||
|
@ -19,7 +19,7 @@ class WSBugLinkInlineMacro < Extensions::InlineMacroProcessor
|
|||
name_positional_attributes 'bugtext'
|
||||
|
||||
def process(parent, issueid, attrs)
|
||||
bugtext = attrs['bugtext'] || %(Bug #{issueid})
|
||||
bugtext = attrs['bugtext'] || %(Issue #{issueid})
|
||||
target = %(https://gitlab.com/wireshark/wireshark/-/issues/#{issueid})
|
||||
create_doc_links(parent, target, bugtext)
|
||||
end
|
||||
|
|
|
@ -3,7 +3,7 @@ require 'asciidoctor/extensions' unless RUBY_ENGINE == 'opal'
|
|||
|
||||
include ::Asciidoctor
|
||||
|
||||
# An inline macro that generates links to related man pages.
|
||||
# An inline macro that generates a link to a Wireshark Security Advisory.
|
||||
#
|
||||
# Usage
|
||||
#
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Common attributes
|
||||
|
||||
:wireshark-version: 3.3.2
|
||||
:wireshark-version: 3.4.7
|
||||
|
||||
// Required for btn, kbd:, and menu: macros.
|
||||
:experimental:
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<!-- Document information for the Developer's Guide. -->
|
||||
|
||||
<!-- Updated by tools/make-version.pl -->
|
||||
<subtitle>For Wireshark 3.3</subtitle>
|
||||
<subtitle>For Wireshark 3.4</subtitle>
|
||||
|
||||
<!-- <title><inlinegraphic entityref="WiresharkLogo" valign="middle" format="PNG"/> &DocumentTitle;</title> -->
|
||||
|
||||
|
|
|
@ -6,8 +6,6 @@ include::attributes.adoc[]
|
|||
// Asciidoctor Syntax Quick Reference:
|
||||
// https://asciidoctor.org/docs/asciidoc-syntax-quick-reference/
|
||||
|
||||
This is an experimental release intended to test new features for Wireshark 3.4.
|
||||
|
||||
== What is Wireshark?
|
||||
|
||||
Wireshark is the world’s most popular network protocol analyzer.
|
||||
|
@ -15,49 +13,45 @@ It is used for troubleshooting, analysis, development and education.
|
|||
|
||||
== What’s New
|
||||
|
||||
Many improvements have been made.
|
||||
See the “New and Updated Features” section below for more details.
|
||||
// The Windows installers now ship with Npcap 1.31.
|
||||
// They previously shipped with Npcap 1.10.
|
||||
|
||||
// === Bug Fixes
|
||||
// The Windows installers now ship with USBPcap 1.5.X.0.
|
||||
// They previously shipped with USBPcap 1.5.4.0.
|
||||
|
||||
// The following bugs have been fixed:
|
||||
// The Windows installers now ship with Qt 5.15.2.
|
||||
// They previously shipped with Qt 5.12.1.
|
||||
|
||||
=== Bug Fixes
|
||||
|
||||
The following vulnerabilities have been fixed:
|
||||
|
||||
* wssalink:2021-06[]
|
||||
DNP dissector crash.
|
||||
wsbuglink:17462[].
|
||||
cveidlink:2021-22235[].
|
||||
// Fixed in master: 029a7fcec5
|
||||
// Fixed in release-3.4: 490fe2684b
|
||||
// Fixed in master-3.2: d9497073c4
|
||||
// CVSS AV:N/AC:L/PR:N/UI:R/S:U/C:L/I:L/A:L
|
||||
// CWE-762: Mismatched Memory Management Routines
|
||||
|
||||
The following bugs have been fixed:
|
||||
|
||||
//* wsbuglink:5000[]
|
||||
//* wsbuglink:6000[Wireshark bug]
|
||||
//* cveidlink:2014-2486[]
|
||||
//* Wireshark exposed details your sordid redneck past, which were subsequently widely disseminated on social media.
|
||||
// cp /dev/null /tmp/buglist.txt ; for bugnumber in `git log v3.4.4rc0.. | gsed -e 's/\(close\|fix\|resolv\)[^ ]* #/\nclose #/gI' | grep ^close | sed -e 's/close.*#\([1-9][0-9]*\).*/\1/' | sort -V -u` ; do "$(git rev-parse --show-toplevel)/tools/gen-bugnote" $bugnumber; pbpaste >> /tmp/buglist.txt; done
|
||||
|
||||
* TCP dissector - Erroneous DSACK reporting wsbuglink:17315[].
|
||||
|
||||
* No wlan_radio.duration calculated for PHY type: 802.11ac (VHT) wsbuglink:17419[].
|
||||
|
||||
* NAN Dissector has wrong minimum length for availability attribute wsbuglink:17431[].
|
||||
|
||||
=== New and Updated Features
|
||||
|
||||
The following features are new (or have been significantly updated) since version 3.3.1:
|
||||
|
||||
* The Protobuf fields defined as google.protobuf.Timestamp type of Protobuf standard library
|
||||
can now be dissected as Wireshark fields of absolute time type.
|
||||
|
||||
The following features are new (or have been significantly updated) since version 3.3.0:
|
||||
|
||||
* The Windows installers now ship with Npcap 1.00.
|
||||
They previously shipped with Npcap 0.9997.
|
||||
* The Windows installers now ship with Qt 5.15.1.
|
||||
They previously shipped with Qt 5.12.8.
|
||||
|
||||
The following features are new (or have been significantly updated) since version 3.2.0:
|
||||
|
||||
* Windows executables and installers are now https://support.microsoft.com/en-us/help/4472027/2019-sha-2-code-signing-support-requirement-for-windows-and-wsus[signed using SHA-2 only].
|
||||
* Save RTP stream to .au supports any codec with 8000 Hz rate supported by Wireshark (shown in RTP player). If save of audio is not possible (unsupported codec or rate), silence of same length is saved and warning is shown.
|
||||
* Asynchronous DNS resolution is always enabled. As a result, the c-ares library is now a required dependency.
|
||||
* Protobuf fields can be dissected as Wireshark (header) fields that allows user input
|
||||
the full names of Protobuf fields or messages in Filter toolbar for searching.
|
||||
* Dissectors based on Protobuf can register themselves to a new 'protobuf_field' dissector table,
|
||||
which is keyed with the full names of fields, for further parsing fields of BYTES or STRING type.
|
||||
* Wireshark is able to decode, play, and save iLBC payload on platforms where the https://github.com/TimothyGu/libilbc[iLBC library] is available.
|
||||
* Wireshark is able to decode, play, and save opus payload on platforms where the https://opus-codec.org/[opus library] is available.
|
||||
* “Decode As” entries can now be copied from other profiles using a button in the dialog.
|
||||
* sshdump can now be copied to multiple instances. Each instance will show up a different interface and will have its own profile.
|
||||
* The main window now supports a packet diagram view, which shows each packet as a textbook-style diagram.
|
||||
* Filter buttons (“Preferences -> Filter Buttons”) can be grouped by using “//” as a path separator in the filter button label.
|
||||
* IPP Over USB packets can now be dissected and displayed
|
||||
|
||||
// === Removed Features and Support
|
||||
|
||||
//=== Removed Dissectors
|
||||
|
@ -70,41 +64,31 @@ The following features are new (or have been significantly updated) since versio
|
|||
|
||||
=== New Protocol Support
|
||||
|
||||
// Add one protocol per line between the -- delimiters.
|
||||
[commaize]
|
||||
--
|
||||
Arinc 615A (A615A)
|
||||
Asphodel Protocol
|
||||
AudioCodes Debug Recording (ACDR)
|
||||
Bluetooth HCI ISO (BT HCI ISO)
|
||||
Cisco MisCabling Protocol (MCP)
|
||||
Community ID Flow Hashing (CommunityID)
|
||||
DCE/RPC IRemoteWinspool SubSystem, (IREMOTEWINSPOOL)
|
||||
Dynamic Link Exchange Protocol (DLEP)
|
||||
Fortinet Single Sign-on (FSSO)
|
||||
FTDI Multi-Protocol Synchronous Serial Engine (FTDI MPSSE)
|
||||
EAP Generalized Pre-Shared Key (EAP-GPSK)
|
||||
EAP Password Authenticated Exchange (EAP-PAX)
|
||||
EAP Pre-Shared Key (EAP-PSK)
|
||||
EAP Shared-secret Authentication and Key Establishment (EAP-SAKE)
|
||||
Hypertext Transfer Protocol Version 3 (HTTP3)
|
||||
ILDA Digital Network (IDN)
|
||||
Java Debug Wire Protocol (JDWP)
|
||||
LBM Stateful Resolution Service (LBMSRS)
|
||||
Lithionics Battery Management
|
||||
OBSAI UDP-based Communication Protocol (UDPCP)
|
||||
Palo Alto Heartbeat Backup (PA-HB-Bak)
|
||||
ScyllaDB RPC
|
||||
Technically Enhanced Capture Module Protocol (TECMP)
|
||||
Tunnel Extensible Authentication Protocol (TEAP)
|
||||
UDP based FTP w/ multicast V5 (UFTP5)
|
||||
USB Printer (USBPRINTER)
|
||||
ILDA Digital Network (IDN)
|
||||
--
|
||||
There are no new protocols in this release.
|
||||
|
||||
=== Updated Protocol Support
|
||||
|
||||
Too many protocols have been updated to list here.
|
||||
// Add one protocol per line between the -- delimiters.
|
||||
[commaize]
|
||||
--
|
||||
ASTERIX
|
||||
BT LE LL
|
||||
DCE RPC
|
||||
DNP
|
||||
GTPv2
|
||||
IEEE 802.11 Radio
|
||||
LDAP
|
||||
NAN
|
||||
NORDIC_BLE
|
||||
NR RRC
|
||||
OSPF
|
||||
pcapng
|
||||
PNIO
|
||||
RSL
|
||||
S101
|
||||
Snort config
|
||||
TCP
|
||||
--
|
||||
|
||||
=== New and Updated Capture File Support
|
||||
|
||||
|
@ -112,7 +96,9 @@ Too many protocols have been updated to list here.
|
|||
// Add one file type per line between the -- delimiters.
|
||||
[commaize]
|
||||
--
|
||||
MP4 (ISO/IEC 14496-12)
|
||||
Catapult DCT2000
|
||||
ERF
|
||||
pcap
|
||||
--
|
||||
|
||||
// === New and Updated Capture Interfaces support
|
||||
|
@ -146,12 +132,12 @@ The User’s Guide, manual pages and various other documentation can be found at
|
|||
https://www.wireshark.org/docs/
|
||||
|
||||
Community support is available on
|
||||
https://ask.wireshark.org/[Wireshark’sQ&A site]
|
||||
https://ask.wireshark.org/[Wireshark’s Q&A site]
|
||||
and on the wireshark-users mailing list.
|
||||
Subscription information and archives for all of Wireshark’s mailing lists can be found on
|
||||
https://www.wireshark.org/lists/[the web site].
|
||||
|
||||
Bugs and feature requests can be reported on
|
||||
Issues and feature requests can be reported on
|
||||
https://gitlab.com/wireshark/wireshark/-/issues[the issue tracker].
|
||||
|
||||
// Official Wireshark training and certification are available from
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<!-- Document information for the User's Guide. -->
|
||||
|
||||
<!-- Updated by tools/make-version.pl -->
|
||||
<subtitle>For Wireshark 3.3</subtitle>
|
||||
<subtitle>For Wireshark 3.4</subtitle>
|
||||
|
||||
<!--
|
||||
<title><inlinegraphic entityref="WiresharkLogo" valign="middle" format="PNG"/> &DocumentTitle;</title>
|
||||
|
|
|
@ -243,6 +243,7 @@ include::{build_dir}/wsluarm_src/wslua_tree.adoc[]
|
|||
include::{build_dir}/wsluarm_src/wslua_tvb.adoc[]
|
||||
include::{build_dir}/wsluarm_src/wslua_file.adoc[]
|
||||
include::{build_dir}/wsluarm_src/wslua_dir.adoc[]
|
||||
include::{build_dir}/wsluarm_src/wslua_wtap.adoc[]
|
||||
include::{build_dir}/wsluarm_src/wslua_util.adoc[]
|
||||
include::{build_dir}/wsluarm_src/wslua_int64.adoc[]
|
||||
include::{build_dir}/wsluarm_src/wslua_struct.adoc[]
|
||||
|
|
|
@ -484,8 +484,8 @@ Information about the folders used for capture files can be found in
|
|||
|File Name|“Create a new file...”|“Use a ring buffer...”|Mode|Resulting filename(s) used
|
||||
|-|-|-|Single temporary file|wiresharkXXXXXX (where XXXXXX is a unique number)
|
||||
|foo.cap|-|-|Single named file|foo.cap
|
||||
|foo.cap|x|-|Multiple files, continuous|foo_00001_20200714110102.cap, foo_00002_20200714110318.cap, ...
|
||||
|foo.cap|x|x|Multiple files, ring buffer|foo_00001_20200714110102.cap, foo_00002_20200714110318.cap, ...
|
||||
|foo.cap|x|-|Multiple files, continuous|foo_00001_20210714110102.cap, foo_00002_20210714110318.cap, ...
|
||||
|foo.cap|x|x|Multiple files, ring buffer|foo_00001_20210714110102.cap, foo_00002_20210714110318.cap, ...
|
||||
|===
|
||||
|
||||
Single temporary file::
|
||||
|
|
|
@ -507,7 +507,7 @@ some features to handle these file sets in a convenient way.
|
|||
.How does Wireshark detect the files of a file set?
|
||||
****
|
||||
A filename in a file set uses the format Prefix_Number_DateTimeSuffix which
|
||||
might look something like `test_00001_20200714183910.pcap`. All files of a file
|
||||
might look something like `test_00001_20210714183910.pcap`. All files of a file
|
||||
set share the same prefix (e.g. “test”) and suffix (e.g. “.pcap”) and a
|
||||
varying middle part.
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
Capinfos (Wireshark) 3.3.2 (v3.3.2rc0-16-g1936fef77a42)
|
||||
Capinfos (Wireshark) 3.4.7 (v3.4.7rc0-4-g9eb1c665c661)
|
||||
Print various information (infos) about capture files.
|
||||
See https://www.wireshark.org for more information.
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
Dumpcap (Wireshark) 3.3.2 (v3.3.2rc0-16-g1936fef77a42)
|
||||
Dumpcap (Wireshark) 3.4.7 (v3.4.7rc0-4-g9eb1c665c661)
|
||||
Capture network packets and dump them into a pcapng or pcap file.
|
||||
See https://www.wireshark.org for more information.
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
Editcap (Wireshark) 3.3.2 (v3.3.2rc0-16-g1936fef77a42)
|
||||
Editcap (Wireshark) 3.4.7 (v3.4.7rc0-4-g9eb1c665c661)
|
||||
Edit and/or translate the format of capture files.
|
||||
See https://www.wireshark.org for more information.
|
||||
|
||||
|
@ -106,3 +106,4 @@ Miscellaneous:
|
|||
If -v is used with any of the 'Duplicate Packet
|
||||
Removal' options (-d, -D or -w) then Packet lengths
|
||||
and MD5 hashes are printed to standard-error.
|
||||
-V, --version print version information and exit.
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
Mergecap (Wireshark) 3.3.2 (v3.3.2rc0-16-g1936fef77a42)
|
||||
Mergecap (Wireshark) 3.4.7 (v3.4.7rc0-4-g9eb1c665c661)
|
||||
Merge two or more capture files into one.
|
||||
See https://www.wireshark.org for more information.
|
||||
|
||||
|
@ -17,3 +17,4 @@ Output:
|
|||
Miscellaneous:
|
||||
-h display this help and exit.
|
||||
-v verbose output.
|
||||
-V print version information and exit.
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
Rawshark (Wireshark) 3.3.2 (v3.3.2rc0-16-g1936fef77a42)
|
||||
Rawshark (Wireshark) 3.4.7 (v3.4.7rc0-4-g9eb1c665c661)
|
||||
Dump and analyze network traffic.
|
||||
See https://www.wireshark.org for more information.
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
Reordercap (Wireshark) 3.3.2 (v3.3.2rc0-16-g1936fef77a42)
|
||||
Reordercap (Wireshark) 3.4.7 (v3.4.7rc0-4-g9eb1c665c661)
|
||||
Reorder timestamps of input file frames into output file.
|
||||
See https://www.wireshark.org for more information.
|
||||
|
||||
|
@ -7,3 +7,4 @@ Usage: reordercap [options] <infile> <outfile>
|
|||
Options:
|
||||
-n don't write to output file if the input file is ordered.
|
||||
-h display this help and exit.
|
||||
-v print version information and exit.
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
Text2pcap (Wireshark) 3.3.2 (v3.3.2rc0-16-g1936fef77a42)
|
||||
Text2pcap (Wireshark) 3.4.7 (v3.4.7rc0-4-g9eb1c665c661)
|
||||
Generate a capture file from an ASCII hexdump of packets.
|
||||
See https://www.wireshark.org for more information.
|
||||
|
||||
|
@ -77,5 +77,6 @@ Prepend dummy header:
|
|||
|
||||
Miscellaneous:
|
||||
-h display this help and exit.
|
||||
-v print version information and exit.
|
||||
-d show detailed debug of parser states.
|
||||
-q generate no output at all (automatically disables -d).
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
TShark (Wireshark) 3.3.2 (v3.3.2rc0-16-g1936fef77a42)
|
||||
TShark (Wireshark) 3.4.7 (v3.4.7rc0-4-g9eb1c665c661)
|
||||
Dump and analyze network traffic.
|
||||
See https://www.wireshark.org for more information.
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
Wireshark 3.3.2 (v3.3.2rc0-16-g1936fef77a42)
|
||||
Wireshark 3.4.7 (v3.4.7rc0-4-g9eb1c665c661)
|
||||
Interactively dump and analyze network traffic.
|
||||
See https://www.wireshark.org for more information.
|
||||
|
||||
|
|
200
dumpcap.c
200
dumpcap.c
|
@ -547,15 +547,17 @@ relinquish_all_capabilities(void)
|
|||
#elif defined(__APPLE__)
|
||||
#define PLATFORM_PERMISSIONS_SUGGESTION \
|
||||
"\n\n" \
|
||||
"If you installed Wireshark using the package from wireshark.org, "\
|
||||
"Try re-installing it and checking the box for the \"Set capture " \
|
||||
"permissions on startup\" item."
|
||||
"If you installed Wireshark using the package from wireshark.org, " \
|
||||
"close this dialog and click on the \"installing ChmodBPF\" link in " \
|
||||
"\"You can fix this by installing ChmodBPF.\" on the main screen, " \
|
||||
"and then complete the installation procedure."
|
||||
#else
|
||||
#define PLATFORM_PERMISSIONS_SUGGESTION
|
||||
#endif
|
||||
|
||||
static const char *
|
||||
get_pcap_failure_secondary_error_message(cap_device_open_err open_err)
|
||||
get_pcap_failure_secondary_error_message(cap_device_open_err open_err,
|
||||
const char *open_err_str)
|
||||
{
|
||||
#ifdef _WIN32
|
||||
/*
|
||||
|
@ -579,13 +581,33 @@ get_pcap_failure_secondary_error_message(cap_device_open_err open_err)
|
|||
*/
|
||||
if (open_err == CAP_DEVICE_OPEN_ERR_GENERIC) {
|
||||
/*
|
||||
* We don't know what kind of error it is, so throw all the
|
||||
* suggestions at the user.
|
||||
* We don't know what kind of error it is. See if there's a hint
|
||||
* in the error string; if not, throw all generic suggestions at
|
||||
* the user.
|
||||
*/
|
||||
return
|
||||
"Please check to make sure you have sufficient permissions, and that you have "
|
||||
"the proper interface or pipe specified."
|
||||
PLATFORM_PERMISSIONS_SUGGESTION;
|
||||
static const char promisc_failed[] =
|
||||
"failed to set hardware filter to promiscuous mode";
|
||||
|
||||
/*
|
||||
* Does the error string begin with the error produced by WinPcap
|
||||
* and Npcap if attempting to set promiscuous mode fails?
|
||||
* (Note that this string could have a specific error message
|
||||
* from an NDIS error after the initial part, so we do a prefix
|
||||
* check rather than an exact match check.)
|
||||
*/
|
||||
if (strncmp(open_err_str, promisc_failed, sizeof promisc_failed - 1) == 0) {
|
||||
/*
|
||||
* Yes. Suggest that the user turn off promiscuous mode on that
|
||||
* device.
|
||||
*/
|
||||
return
|
||||
"Please turn off promiscuous mode for this device";
|
||||
} else {
|
||||
return
|
||||
"Please check to make sure you have sufficient permissions, and that you have "
|
||||
"the proper interface or pipe specified."
|
||||
PLATFORM_PERMISSIONS_SUGGESTION;
|
||||
}
|
||||
} else if (open_err == CAP_DEVICE_OPEN_ERR_PERMISSIONS) {
|
||||
/*
|
||||
* This is a permissions error, so no need to specify any other
|
||||
|
@ -616,7 +638,7 @@ get_capture_device_open_failure_messages(cap_device_open_err open_err,
|
|||
"The capture session could not be initiated on interface '%s' (%s).",
|
||||
iface, open_err_str);
|
||||
g_snprintf(secondary_errmsg, (gulong) secondary_errmsg_len, "%s",
|
||||
get_pcap_failure_secondary_error_message(open_err));
|
||||
get_pcap_failure_secondary_error_message(open_err, open_err_str));
|
||||
}
|
||||
|
||||
static gboolean
|
||||
|
@ -1315,6 +1337,7 @@ static int
|
|||
cap_open_socket(char *pipename, capture_src *pcap_src, char *errmsg, size_t errmsgl)
|
||||
{
|
||||
struct sockaddr_storage sa;
|
||||
socklen_t sa_len;
|
||||
int fd;
|
||||
|
||||
/* Skip the initial "TCP@" in the pipename. */
|
||||
|
@ -1326,10 +1349,27 @@ cap_open_socket(char *pipename, capture_src *pcap_src, char *errmsg, size_t errm
|
|||
return -1;
|
||||
}
|
||||
|
||||
if ((fd = (int)socket(sa.ss_family, SOCK_STREAM, 0)) < 0 ||
|
||||
connect(fd, (struct sockaddr *)&sa, sizeof(sa)) < 0) {
|
||||
if ((fd = (int)socket(sa.ss_family, SOCK_STREAM, 0)) < 0) {
|
||||
g_snprintf(errmsg, (gulong)errmsgl,
|
||||
"The capture session could not be initiated due to the socket error: \n"
|
||||
"The capture session could not be initiated because"
|
||||
" the socket couldn't be created due to the socket error: \n"
|
||||
#ifdef _WIN32
|
||||
" %s", win32strerror(WSAGetLastError()));
|
||||
#else
|
||||
" %d: %s", errno, g_strerror(errno));
|
||||
#endif
|
||||
pcap_src->cap_pipe_err = PIPERR;
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (sa.ss_family == AF_INET6)
|
||||
sa_len = sizeof(struct sockaddr_in6);
|
||||
else
|
||||
sa_len = sizeof(struct sockaddr_in);
|
||||
if (connect(fd, (struct sockaddr *)&sa, sa_len) < 0) {
|
||||
g_snprintf(errmsg, (gulong)errmsgl,
|
||||
"The capture session could not be initiated because"
|
||||
" the socket couldn't be connected due to the socket error: \n"
|
||||
#ifdef _WIN32
|
||||
" %s", win32strerror(WSAGetLastError()));
|
||||
#else
|
||||
|
@ -1337,8 +1377,7 @@ cap_open_socket(char *pipename, capture_src *pcap_src, char *errmsg, size_t errm
|
|||
#endif
|
||||
pcap_src->cap_pipe_err = PIPERR;
|
||||
|
||||
if (fd >= 0)
|
||||
cap_pipe_close(fd, TRUE);
|
||||
cap_pipe_close(fd, TRUE);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
@ -3665,6 +3704,50 @@ capture_loop_dequeue_packet(void) {
|
|||
return FALSE;
|
||||
}
|
||||
|
||||
/*
|
||||
* Note: this code will never be run on any OS other than Windows.
|
||||
*/
|
||||
static char *
|
||||
please_report_npcap_bug(char *adapter_name, char *cap_err_str)
|
||||
{
|
||||
GString *pcap_info_str;
|
||||
GString *windows_info_str;
|
||||
char *msg;
|
||||
|
||||
pcap_info_str = g_string_new("");
|
||||
get_runtime_caplibs_version(pcap_info_str);
|
||||
if (!g_str_has_prefix(pcap_info_str->str, "with Npcap")) {
|
||||
/*
|
||||
* We're not using Npcap, so don't recomment a user
|
||||
* file a bug against Npcap.
|
||||
*/
|
||||
g_string_free(pcap_info_str, TRUE);
|
||||
return g_strdup("");
|
||||
}
|
||||
windows_info_str = g_string_new("");
|
||||
get_os_version_info(windows_info_str);
|
||||
msg = g_strdup_printf("If you have not removed that adapter, this "
|
||||
"may be a bug in Npcap: please report it "
|
||||
"as an issue at https://github.com/nmap/npcap/issues\n\n"
|
||||
"Give all details, such as:\n\n"
|
||||
"The name of the adapter on which the error occurred (\"%s\");\n"
|
||||
"The error message \"%s\";\n"
|
||||
"The full version of Windows on which this occurred (\"%s\");\n"
|
||||
"The version of Npcap with which this occurred (\"%s\");\n"
|
||||
"Any indication of whether the machine went to sleep "
|
||||
"during the capture;\n"
|
||||
"Any indication of whether any other interfaces "
|
||||
"were added to or removed from the machine while "
|
||||
"the capture was taking place.",
|
||||
adapter_name,
|
||||
cap_err_str,
|
||||
windows_info_str->str,
|
||||
pcap_info_str->str);
|
||||
g_string_free(windows_info_str, TRUE);
|
||||
g_string_free(pcap_info_str, TRUE);
|
||||
return msg;
|
||||
}
|
||||
|
||||
/* Do the low-level work of a capture.
|
||||
Returns TRUE if it succeeds, FALSE otherwise. */
|
||||
static gboolean
|
||||
|
@ -3982,32 +4065,93 @@ capture_loop_start(capture_options *capture_opts, gboolean *stats_known, struct
|
|||
On OpenBSD, you get "read: I/O error" (EIO) in the same case.
|
||||
|
||||
With WinPcap and Npcap, you'll get
|
||||
"read error: PacketReceivePacket failed".
|
||||
"read error: PacketReceivePacket failed" or
|
||||
"PacketReceivePacket error: The device has been removed. (1617)".
|
||||
|
||||
Newer versions of libpcap map some or all of those to just
|
||||
"The interface disappeared" or something beginning with
|
||||
"The interface disappeared".
|
||||
|
||||
These should *not* be reported to the Wireshark developers. */
|
||||
These should *not* be reported to the Wireshark developers,
|
||||
although, with Npcap, "The interface disappeared" messages
|
||||
should perhaps be reported to the Npcap developers, at least
|
||||
until errors of that sort that shouldn't happen are fixed,
|
||||
if that's possible. */
|
||||
char *cap_err_str;
|
||||
char *primary_msg;
|
||||
char *secondary_msg;
|
||||
|
||||
interface_opts = &g_array_index(capture_opts->ifaces, interface_options, i);
|
||||
cap_err_str = pcap_geterr(pcap_src->pcap_h);
|
||||
if (strcmp(cap_err_str, "The interface went down") == 0 ||
|
||||
strcmp(cap_err_str, "recvfrom: Network is down") == 0) {
|
||||
report_capture_error("The network adapter on which the capture was being done "
|
||||
"is no longer running; the capture has stopped.",
|
||||
"");
|
||||
primary_msg = g_strdup_printf("The network adapter \"%s\" "
|
||||
"is no longer running; the "
|
||||
"capture has stopped.",
|
||||
interface_opts->display_name);
|
||||
secondary_msg = g_strdup("");
|
||||
} else if (strcmp(cap_err_str, "The interface disappeared") == 0 ||
|
||||
strcmp(cap_err_str, "read: Device not configured") == 0 ||
|
||||
strcmp(cap_err_str, "read: I/O error") == 0 ||
|
||||
strcmp(cap_err_str, "read error: PacketReceivePacket failed") == 0) {
|
||||
report_capture_error("The network adapter on which the capture was being done "
|
||||
"is no longer attached; the capture has stopped.",
|
||||
"");
|
||||
primary_msg = g_strdup_printf("The network adapter \"%s\" "
|
||||
"is no longer attached; the "
|
||||
"capture has stopped.",
|
||||
interface_opts->display_name);
|
||||
secondary_msg = g_strdup("");
|
||||
} else if (g_str_has_prefix(cap_err_str, "The interface disappeared ")) {
|
||||
/*
|
||||
* Npcap, if it picks up a recent commit to libpcap, will
|
||||
* report an error *beginning* with "The interface
|
||||
* disappeared", with the name of the Windows status code,
|
||||
* and the corresponding NT status code, after it.
|
||||
*
|
||||
* Those should be reported as Npcap issues.
|
||||
*/
|
||||
primary_msg = g_strdup_printf("The network adapter \"%s\" "
|
||||
"is no longer attached; the "
|
||||
"capture has stopped.",
|
||||
interface_opts->display_name);
|
||||
secondary_msg = please_report_npcap_bug(interface_opts->display_name,
|
||||
cap_err_str);
|
||||
} else if (g_str_has_prefix(cap_err_str, "PacketReceivePacket error:") &&
|
||||
g_str_has_suffix(cap_err_str, "(1617)")) {
|
||||
/*
|
||||
* "PacketReceivePacket error: {message in arbitrary language} (1617)",
|
||||
* which is ERROR_DEVICE_REMOVED.
|
||||
*
|
||||
* Current libpcap/Npcap treat ERROR_GEN_FAILURE as
|
||||
* "the device is no longer attached"; users are also
|
||||
* getting ERROR_DEVICE_REMOVED.
|
||||
*
|
||||
* For now, some users appear to be getg ERROR_DEVICE_REMOVED
|
||||
* in cases where the device *wasn't* removed, so tell
|
||||
* them to report this as an Npcap issue; I seem to
|
||||
* remember some discussion between Daniel and somebody
|
||||
* at Microsoft about the Windows 10 network stack setup/
|
||||
* teardown code being modified to try to prevent those
|
||||
* sort of problems popping up, but I can't find that
|
||||
* discussion.
|
||||
*/
|
||||
primary_msg = g_strdup_printf("The network adapter \"%s\" "
|
||||
"is no longer attached; the "
|
||||
"capture has stopped.",
|
||||
interface_opts->display_name);
|
||||
secondary_msg = please_report_npcap_bug(interface_opts->display_name,
|
||||
"The interface disappeared (error code ERROR_DEVICE_REMOVED/STATUS_DEVICE_REMOVED)");
|
||||
} else if (strcmp(cap_err_str, "The other host terminated the connection") == 0) {
|
||||
primary_msg = g_strdup(cap_err_str);
|
||||
secondary_msg = g_strdup("This may be a problem with the "
|
||||
"remote host on which you are "
|
||||
"capturing packets.");
|
||||
} else {
|
||||
g_snprintf(errmsg, sizeof(errmsg), "Error while capturing packets: %s",
|
||||
cap_err_str);
|
||||
report_capture_error(errmsg, please_report_bug());
|
||||
primary_msg = g_strdup_printf("Error while capturing packets: %s",
|
||||
cap_err_str);
|
||||
secondary_msg = g_strdup(please_report_bug());
|
||||
}
|
||||
report_capture_error(primary_msg, secondary_msg);
|
||||
g_free(primary_msg);
|
||||
g_free(secondary_msg);
|
||||
break;
|
||||
} else if (pcap_src->from_cap_pipe && pcap_src->cap_pipe_err == PIPERR) {
|
||||
report_capture_error(errmsg, "");
|
||||
|
@ -5167,7 +5311,7 @@ main(int argc, char *argv[])
|
|||
if (caps == NULL) {
|
||||
cmdarg_err("The capabilities of the capture device \"%s\" could not be obtained (%s).\n"
|
||||
"%s", interface_opts->name, err_str,
|
||||
get_pcap_failure_secondary_error_message(err));
|
||||
get_pcap_failure_secondary_error_message(err, err_str));
|
||||
g_free(err_str);
|
||||
exit_main(2);
|
||||
}
|
||||
|
|
108
editcap.c
108
editcap.c
|
@ -155,10 +155,10 @@ GPtrArray *capture_comments = NULL;
|
|||
#define MAX_SELECTIONS 512
|
||||
static struct select_item selectfrm[MAX_SELECTIONS];
|
||||
static guint max_selected = 0;
|
||||
static int keep_em = 0;
|
||||
static gboolean keep_em = FALSE;
|
||||
static int out_file_type_subtype = WTAP_FILE_TYPE_SUBTYPE_PCAPNG; /* default to pcapng */
|
||||
static int out_frame_type = -2; /* Leave frame type alone */
|
||||
static int verbose = 0; /* Not so verbose */
|
||||
static gboolean verbose = FALSE; /* Not so verbose */
|
||||
static struct time_adjustment time_adj = {NSTIME_INIT_ZERO, 0}; /* no adjustment */
|
||||
static nstime_t relative_time_window = NSTIME_INIT_ZERO; /* de-dup time window */
|
||||
static double err_prob = -1.0;
|
||||
|
@ -328,7 +328,7 @@ add_selection(char *sel, guint* max_selection)
|
|||
|
||||
/* Was the packet selected? */
|
||||
|
||||
static int
|
||||
static gboolean
|
||||
selected(guint recno)
|
||||
{
|
||||
guint i;
|
||||
|
@ -336,14 +336,14 @@ selected(guint recno)
|
|||
for (i = 0; i < max_selected; i++) {
|
||||
if (selectfrm[i].inclusive) {
|
||||
if (selectfrm[i].first <= recno && selectfrm[i].second >= recno)
|
||||
return 1;
|
||||
return TRUE;
|
||||
} else {
|
||||
if (recno == selectfrm[i].first)
|
||||
return 1;
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
|
@ -855,6 +855,7 @@ print_usage(FILE *output)
|
|||
fprintf(output, " If -v is used with any of the 'Duplicate Packet\n");
|
||||
fprintf(output, " Removal' options (-d, -D or -w) then Packet lengths\n");
|
||||
fprintf(output, " and MD5 hashes are printed to standard-error.\n");
|
||||
fprintf(output, " -V, --version print version information and exit.\n");
|
||||
}
|
||||
|
||||
struct string_elem {
|
||||
|
@ -997,23 +998,49 @@ failure_message_cont(const char *msg_format, va_list ap)
|
|||
|
||||
static wtap_dumper *
|
||||
editcap_dump_open(const char *filename, const wtap_dump_params *params,
|
||||
int *write_err, gchar **write_err_info)
|
||||
GArray *idbs_seen, int *err, gchar **err_info)
|
||||
{
|
||||
wtap_dumper *pdh;
|
||||
|
||||
if (strcmp(filename, "-") == 0) {
|
||||
/* Write to the standard output. */
|
||||
pdh = wtap_dump_open_stdout(out_file_type_subtype, WTAP_UNCOMPRESSED,
|
||||
params, write_err, write_err_info);
|
||||
params, err, err_info);
|
||||
} else {
|
||||
pdh = wtap_dump_open(filename, out_file_type_subtype, WTAP_UNCOMPRESSED,
|
||||
params, write_err, write_err_info);
|
||||
params, err, err_info);
|
||||
}
|
||||
if (pdh == NULL)
|
||||
return NULL;
|
||||
|
||||
/*
|
||||
* If the output file requires interface IDs, add all the IDBs we've
|
||||
* seen so far.
|
||||
*/
|
||||
if (wtap_uses_interface_ids(wtap_dump_file_type_subtype(pdh))) {
|
||||
for (guint i = 0; i < idbs_seen->len; i++) {
|
||||
wtap_block_t if_data = g_array_index(idbs_seen, wtap_block_t, i);
|
||||
|
||||
/*
|
||||
* Add this IDB to the file to which we're currently writing.
|
||||
*/
|
||||
if (!wtap_dump_add_idb(pdh, if_data, err, err_info)) {
|
||||
int close_err;
|
||||
gchar *close_err_info;
|
||||
|
||||
wtap_dump_close(pdh, &close_err, &close_err_info);
|
||||
g_free(close_err_info);
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return pdh;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
process_new_idbs(wtap *wth, wtap_dumper *pdh, int *err, gchar **err_info)
|
||||
process_new_idbs(wtap *wth, wtap_dumper *pdh, GArray *idbs_seen,
|
||||
int *err, gchar **err_info)
|
||||
{
|
||||
wtap_block_t if_data;
|
||||
|
||||
|
@ -1023,8 +1050,22 @@ process_new_idbs(wtap *wth, wtap_dumper *pdh, int *err, gchar **err_info)
|
|||
* otherwise, it doesn't support writing IDBs.
|
||||
*/
|
||||
if (wtap_uses_interface_ids(wtap_dump_file_type_subtype(pdh))) {
|
||||
wtap_block_t if_data_copy;
|
||||
|
||||
/*
|
||||
* Add this IDB to the file to which we're currently writing.
|
||||
*/
|
||||
if (!wtap_dump_add_idb(pdh, if_data, err, err_info))
|
||||
return FALSE;
|
||||
|
||||
/*
|
||||
* Also add it to the set of IDBs we've seen, in case we
|
||||
* start writing to another file (which would be of the
|
||||
* same type as the current file, and thus will also require
|
||||
* interface IDs).
|
||||
*/
|
||||
if_data_copy = wtap_block_make_copy(if_data);
|
||||
g_array_append_val(idbs_seen, if_data_copy);
|
||||
}
|
||||
}
|
||||
return TRUE;
|
||||
|
@ -1065,6 +1106,7 @@ main(int argc, char *argv[])
|
|||
chop_t chop = {0, 0, 0, 0, 0, 0}; /* No chop */
|
||||
gboolean adjlen = FALSE;
|
||||
wtap_dumper *pdh = NULL;
|
||||
GArray *idbs_seen = NULL;
|
||||
unsigned int count = 1;
|
||||
unsigned int duplicate_count = 0;
|
||||
gint64 data_offset;
|
||||
|
@ -1425,7 +1467,12 @@ invalid_time:
|
|||
break;
|
||||
|
||||
case 'r':
|
||||
keep_em = !keep_em; /* Just invert */
|
||||
if (keep_em) {
|
||||
cmdarg_err("-r was specified twice");
|
||||
ret = INVALID_OPTION;
|
||||
goto clean_exit;
|
||||
}
|
||||
keep_em = TRUE;
|
||||
break;
|
||||
|
||||
case 's':
|
||||
|
@ -1459,7 +1506,12 @@ invalid_time:
|
|||
break;
|
||||
|
||||
case 'v':
|
||||
verbose = !verbose; /* Just invert */
|
||||
if (verbose) {
|
||||
cmdarg_err("-v was specified twice");
|
||||
ret = INVALID_OPTION;
|
||||
goto clean_exit;
|
||||
}
|
||||
verbose = TRUE;
|
||||
break;
|
||||
|
||||
case 'V':
|
||||
|
@ -1672,7 +1724,7 @@ invalid_time:
|
|||
if (add_selection(argv[i], &max_packet_number) == FALSE)
|
||||
break;
|
||||
|
||||
if (keep_em == FALSE)
|
||||
if (!keep_em)
|
||||
max_packet_number = G_MAXUINT;
|
||||
|
||||
if (dup_detect || dup_detect_by_time) {
|
||||
|
@ -1683,6 +1735,9 @@ invalid_time:
|
|||
}
|
||||
}
|
||||
|
||||
/* Set up an array of all IDBs seen */
|
||||
idbs_seen = g_array_new(FALSE, FALSE, sizeof(wtap_block_t));
|
||||
|
||||
/* Read all of the packets in turn */
|
||||
wtap_rec_init(&read_rec);
|
||||
ws_buffer_init(&read_buf, 1514);
|
||||
|
@ -1719,7 +1774,7 @@ invalid_time:
|
|||
wtap_block_add_string_option_format(g_array_index(params.shb_hdrs, wtap_block_t, 0), OPT_SHB_USERAPPL, "%s", get_appname_and_version());
|
||||
}
|
||||
|
||||
pdh = editcap_dump_open(filename, ¶ms, &write_err,
|
||||
pdh = editcap_dump_open(filename, ¶ms, idbs_seen, &write_err,
|
||||
&write_err_info);
|
||||
|
||||
if (pdh == NULL) {
|
||||
|
@ -1734,7 +1789,7 @@ invalid_time:
|
|||
/*
|
||||
* Process whatever IDBs we haven't seen yet.
|
||||
*/
|
||||
if (!process_new_idbs(wth, pdh, &write_err, &write_err_info)) {
|
||||
if (!process_new_idbs(wth, pdh, idbs_seen, &write_err, &write_err_info)) {
|
||||
cfile_write_failure_message("editcap", argv[optind],
|
||||
filename,
|
||||
write_err, write_err_info,
|
||||
|
@ -1772,8 +1827,8 @@ invalid_time:
|
|||
if (verbose)
|
||||
fprintf(stderr, "Continuing writing in file %s\n", filename);
|
||||
|
||||
pdh = editcap_dump_open(filename, ¶ms, &write_err,
|
||||
&write_err_info);
|
||||
pdh = editcap_dump_open(filename, ¶ms, idbs_seen,
|
||||
&write_err, &write_err_info);
|
||||
|
||||
if (pdh == NULL) {
|
||||
cfile_dump_open_failure_message("editcap", filename,
|
||||
|
@ -1804,8 +1859,8 @@ invalid_time:
|
|||
if (verbose)
|
||||
fprintf(stderr, "Continuing writing in file %s\n", filename);
|
||||
|
||||
pdh = editcap_dump_open(filename, ¶ms, &write_err,
|
||||
&write_err_info);
|
||||
pdh = editcap_dump_open(filename, ¶ms, idbs_seen,
|
||||
&write_err, &write_err_info);
|
||||
if (pdh == NULL) {
|
||||
cfile_dump_open_failure_message("editcap", filename,
|
||||
write_err, write_err_info,
|
||||
|
@ -2078,6 +2133,11 @@ invalid_time:
|
|||
caplen = rec->rec_header.syscall_header.event_filelen;
|
||||
do_mutation = TRUE;
|
||||
break;
|
||||
|
||||
case REC_TYPE_SYSTEMD_JOURNAL:
|
||||
caplen = rec->rec_header.systemd_journal_header.record_len;
|
||||
do_mutation = TRUE;
|
||||
break;
|
||||
}
|
||||
|
||||
if (change_offset > caplen) {
|
||||
|
@ -2207,7 +2267,8 @@ invalid_time:
|
|||
g_free (filename);
|
||||
filename = g_strdup(argv[optind+1]);
|
||||
|
||||
pdh = editcap_dump_open(filename, ¶ms, &write_err, &write_err_info);
|
||||
pdh = editcap_dump_open(filename, ¶ms, idbs_seen, &write_err,
|
||||
&write_err_info);
|
||||
if (pdh == NULL) {
|
||||
cfile_dump_open_failure_message("editcap", filename,
|
||||
write_err, write_err_info,
|
||||
|
@ -2245,6 +2306,13 @@ clean_exit:
|
|||
g_array_free(dsb_types, TRUE);
|
||||
g_ptr_array_free(dsb_filenames, TRUE);
|
||||
}
|
||||
if (idbs_seen != NULL) {
|
||||
for (guint b = 0; b < idbs_seen->len; b++) {
|
||||
wtap_block_t if_data = g_array_index(idbs_seen, wtap_block_t, b);
|
||||
wtap_block_free(if_data);
|
||||
}
|
||||
g_array_free(idbs_seen, TRUE);
|
||||
}
|
||||
g_free(params.idb_inf);
|
||||
wtap_dump_params_cleanup(¶ms);
|
||||
if (wth != NULL)
|
||||
|
|
1369
enterprises.tsv
1369
enterprises.tsv
File diff suppressed because it is too large
Load Diff
|
@ -330,7 +330,7 @@ endif()
|
|||
set_target_properties(epan PROPERTIES
|
||||
COMPILE_DEFINITIONS "WS_BUILD_DLL"
|
||||
LINK_FLAGS "${WS_LINK_FLAGS}"
|
||||
VERSION "0.0.0" SOVERSION 0
|
||||
VERSION "14.0.7" SOVERSION 14
|
||||
INSTALL_RPATH "${LIBRARY_INSTALL_RPATH}"
|
||||
# By default the name for a library with target name epan will be libepan,
|
||||
# but Ethereal is now named Wireshark
|
||||
|
|
|
@ -533,6 +533,7 @@ void
|
|||
set_resolution_synchrony(gboolean synchronous)
|
||||
{
|
||||
resolve_synchronously = synchronous;
|
||||
maxmind_db_set_synchrony(synchronous);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
@ -235,7 +235,7 @@ double asn1_get_real(const guint8 *real_ptr, gint len) {
|
|||
/* Ensure the buffer len and its content are coherent */
|
||||
DISSECTOR_ASSERT(lenE < len - 1);
|
||||
|
||||
Eneg = (*p) & 0x80 ? TRUE : FALSE;
|
||||
Eneg = ((*p) & 0x80) ? TRUE : FALSE;
|
||||
for (i = 0; i < lenE; i++) {
|
||||
if(Eneg) {
|
||||
/* 2's complement: inverse bits */
|
||||
|
|
|
@ -1149,7 +1149,7 @@ get_ts_23_038_7bits_string_unpacked(wmem_allocator_t *scope, const guint8 *ptr,
|
|||
strbuf = wmem_strbuf_sized_new(scope, length+1, 0);
|
||||
|
||||
for (i = 0; i < length; i++)
|
||||
saw_escape = handle_ts_23_038_char(strbuf, *ptr, saw_escape);
|
||||
saw_escape = handle_ts_23_038_char(strbuf, *ptr++, saw_escape);
|
||||
|
||||
return (guint8 *)wmem_strbuf_finalize(strbuf);
|
||||
}
|
||||
|
|
|
@ -12,12 +12,12 @@
|
|||
|
||||
#include "ws_symbol_export.h"
|
||||
|
||||
#include <wsutil/color.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#include <wsutil/color.h>
|
||||
|
||||
struct epan_dissect;
|
||||
|
||||
#define COLORFILTERS_FILE_NAME "colorfilters"
|
||||
|
|
|
@ -13,6 +13,8 @@
|
|||
|
||||
#include "ws_symbol_export.h"
|
||||
|
||||
#include "packet.h" /* for conversation dissector type */
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
@ -46,8 +48,6 @@ extern "C" {
|
|||
/* Flags to handle endpoints */
|
||||
#define USE_LAST_ENDPOINT 0x08 /* Use last endpoint created, regardless of type */
|
||||
|
||||
#include "packet.h" /* for conversation dissector type */
|
||||
|
||||
/* Types of port numbers Wireshark knows about. */
|
||||
typedef enum {
|
||||
ENDPOINT_NONE, /* no endpoint */
|
||||
|
|
|
@ -370,8 +370,9 @@ static gboolean macro_update(void* mp, gchar** error) {
|
|||
*w = *r;
|
||||
goto done;
|
||||
case '\\':
|
||||
*(w++) = *(++r);
|
||||
r++;
|
||||
*(w++) = *(r++);
|
||||
if(*r)
|
||||
*(w++) = *(r++);
|
||||
break;
|
||||
case '$': {
|
||||
int cnt = 0;
|
||||
|
@ -612,6 +613,7 @@ void dump_dfilter_macro_t(const dfilter_macro_t *m, const char *function, const
|
|||
if(m == NULL) {
|
||||
ws_debug_printf(" dfilter_macro_t * == NULL! (via: %s(): %s:%d)\n", function, file, line);
|
||||
ws_debug_printf("\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n");
|
||||
return;
|
||||
}
|
||||
|
||||
ws_debug_printf("DUMP of dfilter_macro_t: %p (via: %s(): %s:%d)\n", m, function, file, line);
|
||||
|
|
|
@ -10,8 +10,6 @@
|
|||
#ifndef PACKET_ATN_ULCS_H
|
||||
#define PACKET_ATN_ULCS_H
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#include "packet.h"
|
||||
|
||||
#include <epan/wmem/wmem.h>
|
||||
|
|
|
@ -122,10 +122,10 @@ extern gboolean krb_decrypt;
|
|||
|
||||
#endif /* HAVE_KERBEROS */
|
||||
|
||||
#include "packet-kerberos-exp.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#include "packet-kerberos-exp.h"
|
||||
|
||||
#endif /* __PACKET_KERBEROS_H */
|
||||
|
|
|
@ -158,7 +158,7 @@ ProtocolIE-Field/value ie_field_value
|
|||
if (!parameter_tvb)
|
||||
return offset;
|
||||
subtree = proto_item_add_subtree(actx->created_item, ett_lcsap_plmnd_id);
|
||||
dissect_e212_mcc_mnc(parameter_tvb, actx->pinfo, subtree, 0, E212_NONE, TRUE);
|
||||
dissect_e212_mcc_mnc(parameter_tvb, actx->pinfo, subtree, 0, E212_NONE, FALSE);
|
||||
#.END
|
||||
|
||||
#.FN_BODY Positioning-Method-And-Usage VAL_PTR = ¶meter_tvb
|
||||
|
|
|
@ -1188,13 +1188,13 @@ static void
|
|||
|
||||
proto_tree_add_uint(ldap_tree, hf_ldap_sasl_buffer_length, sasl_tvb, 0, 4, sasl_len);
|
||||
|
||||
sasl_tree = proto_tree_add_subtree(ldap_tree, sasl_tvb, 0, sasl_msg_len, ett_ldap_sasl_blob, NULL, "SASL Buffer");
|
||||
sasl_tree = proto_tree_add_subtree(ldap_tree, sasl_tvb, 4, sasl_msg_len - 4, ett_ldap_sasl_blob, NULL, "SASL Buffer");
|
||||
|
||||
if (ldap_info->auth_mech != NULL &&
|
||||
((strcmp(ldap_info->auth_mech, "GSS-SPNEGO") == 0) ||
|
||||
/* auth_mech may have been set from the bind */
|
||||
(strcmp(ldap_info->auth_mech, "GSSAPI") == 0))) {
|
||||
tvbuff_t *gssapi_tvb, *plain_tvb = NULL, *decr_tvb= NULL;
|
||||
tvbuff_t *gssapi_tvb = NULL;
|
||||
int ver_len;
|
||||
int tmp_length;
|
||||
gssapi_encrypt_info_t gssapi_encrypt;
|
||||
|
@ -1224,6 +1224,9 @@ static void
|
|||
return;
|
||||
}
|
||||
if (gssapi_encrypt.gssapi_decrypted_tvb) {
|
||||
tvbuff_t *decr_tvb = gssapi_encrypt.gssapi_decrypted_tvb;
|
||||
proto_tree *enc_tree = NULL;
|
||||
|
||||
/*
|
||||
* The LDAP payload (blob) was encrypted and we were able to decrypt it.
|
||||
* The data was signed via a MIC token, sealed (encrypted), and "wrapped"
|
||||
|
@ -1231,20 +1234,17 @@ static void
|
|||
* one or more LDAPMessages such as searchRequest messages within this
|
||||
* payload.
|
||||
*/
|
||||
col_set_str(pinfo->cinfo, COL_INFO, "SASL GSS-API Decrypted payload: ");
|
||||
col_set_str(pinfo->cinfo, COL_INFO, "SASL GSS-API Privacy (decrypted): ");
|
||||
|
||||
if (sasl_tree) {
|
||||
proto_tree *enc_tree;
|
||||
guint decr_len = tvb_reported_length(decr_tvb);
|
||||
|
||||
decr_tvb = gssapi_encrypt.gssapi_decrypted_tvb;
|
||||
|
||||
enc_tree = proto_tree_add_subtree_format(sasl_tree, decr_tvb, 0, -1,
|
||||
ett_ldap_payload, NULL, "GSS-API Decrypted payload (%d byte%s)",
|
||||
ett_ldap_payload, NULL, "GSS-API Encrypted payload (%d byte%s)",
|
||||
decr_len, plurality(decr_len, "", "s"));
|
||||
|
||||
dissect_ldap_payload(decr_tvb, pinfo, enc_tree, ldap_info, is_mscldap);
|
||||
}
|
||||
|
||||
dissect_ldap_payload(decr_tvb, pinfo, enc_tree, ldap_info, is_mscldap);
|
||||
}
|
||||
else if (gssapi_encrypt.gssapi_data_encrypted) {
|
||||
/*
|
||||
|
@ -1257,6 +1257,9 @@ static void
|
|||
proto_tree_add_item(sasl_tree, hf_ldap_gssapi_encrypted_payload, gssapi_tvb, ver_len, -1, ENC_NA);
|
||||
}
|
||||
else {
|
||||
tvbuff_t *plain_tvb = tvb_new_subset_remaining(gssapi_tvb, ver_len);
|
||||
proto_tree *plain_tree = NULL;
|
||||
|
||||
/*
|
||||
* The payload was not encrypted (sealed) but was signed via a MIC token.
|
||||
* If krb5_tok_id == KRB_TOKEN_CFX_WRAP, the payload was wrapped within
|
||||
|
@ -1266,18 +1269,14 @@ static void
|
|||
col_set_str(pinfo->cinfo, COL_INFO, "SASL GSS-API Integrity: ");
|
||||
|
||||
if (sasl_tree) {
|
||||
guint plain_len;
|
||||
proto_tree *plain_tree;
|
||||
|
||||
plain_tvb = tvb_new_subset_remaining(gssapi_tvb, ver_len);
|
||||
plain_len = tvb_reported_length(plain_tvb);
|
||||
guint plain_len = tvb_reported_length(plain_tvb);
|
||||
|
||||
plain_tree = proto_tree_add_subtree_format(sasl_tree, plain_tvb, 0, -1,
|
||||
ett_ldap_payload, NULL, "GSS-API payload (%d byte%s)",
|
||||
plain_len, plurality(plain_len, "", "s"));
|
||||
|
||||
dissect_ldap_payload(plain_tvb, pinfo, plain_tree, ldap_info, is_mscldap);
|
||||
}
|
||||
|
||||
dissect_ldap_payload(plain_tvb, pinfo, plain_tree, ldap_info, is_mscldap);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
|
@ -2266,10 +2265,11 @@ proto_reg_handoff_ldap(void)
|
|||
oid_add_from_string("ISO assigned OIDs, USA", "1.2.840");
|
||||
|
||||
/* http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dsml/dsml/ldap_controls_and_session_support.asp */
|
||||
/* https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-adts/3c5e87db-4728-4f29-b164-01dd7d7391ea */
|
||||
oid_add_from_string("LDAP_PAGED_RESULT_OID_STRING","1.2.840.113556.1.4.319");
|
||||
oid_add_from_string("LDAP_SERVER_SHOW_DELETED_OID","1.2.840.113556.1.4.417");
|
||||
oid_add_from_string("LDAP_SERVER_SORT_OID","1.2.840.113556.1.4.473");
|
||||
oid_add_from_string("LDAP_CONTROL_SORT_RESP_OID","1.2.840.113556.1.4.474");
|
||||
oid_add_from_string("LDAP_SERVER_RESP_SORT_OID","1.2.840.113556.1.4.474");
|
||||
oid_add_from_string("LDAP_SERVER_CROSSDOM_MOVE_TARGET_OID","1.2.840.113556.1.4.521");
|
||||
oid_add_from_string("LDAP_SERVER_NOTIFICATION_OID","1.2.840.113556.1.4.528");
|
||||
oid_add_from_string("LDAP_SERVER_EXTENDED_DN_OID","1.2.840.113556.1.4.529");
|
||||
|
@ -2279,26 +2279,47 @@ proto_reg_handoff_ldap(void)
|
|||
oid_add_from_string("managedObjects","1.2.840.113556.1.4.654");
|
||||
oid_add_from_string("LDAP_CAP_ACTIVE_DIRECTORY_OID","1.2.840.113556.1.4.800");
|
||||
oid_add_from_string("LDAP_SERVER_SD_FLAGS_OID","1.2.840.113556.1.4.801");
|
||||
oid_add_from_string("LDAP_SERVER_RANGE_OPTION_OID","1.2.840.113556.1.4.802");
|
||||
oid_add_from_string("LDAP_OID_COMPARATOR_OR","1.2.840.113556.1.4.804");
|
||||
oid_add_from_string("LDAP_SERVER_TREE_DELETE_OID","1.2.840.113556.1.4.805");
|
||||
oid_add_from_string("LDAP_SERVER_DIRSYNC_OID","1.2.840.113556.1.4.841");
|
||||
oid_add_from_string("None","1.2.840.113556.1.4.970");
|
||||
oid_add_from_string("LDAP_SERVER_GET_STATS_OID","1.2.840.113556.1.4.970");
|
||||
oid_add_from_string("LDAP_SERVER_VERIFY_NAME_OID","1.2.840.113556.1.4.1338");
|
||||
oid_add_from_string("LDAP_SERVER_DOMAIN_SCOPE_OID","1.2.840.113556.1.4.1339");
|
||||
oid_add_from_string("LDAP_SERVER_SEARCH_OPTIONS_OID","1.2.840.113556.1.4.1340");
|
||||
oid_add_from_string("LDAP_SERVER_RODC_DCPROMO_OID","1.2.840.113556.1.4.1341");
|
||||
oid_add_from_string("LDAP_SERVER_PERMISSIVE_MODIFY_OID","1.2.840.113556.1.4.1413");
|
||||
oid_add_from_string("LDAP_SERVER_ASQ_OID","1.2.840.113556.1.4.1504");
|
||||
oid_add_from_string("LDAP_CAP_ACTIVE_DIRECTORY_V51_OID","1.2.840.113556.1.4.1670");
|
||||
oid_add_from_string("msDS-SDReferenceDomain","1.2.840.113556.1.4.1711");
|
||||
oid_add_from_string("msDS-AdditionalDnsHostName","1.2.840.113556.1.4.1717");
|
||||
oid_add_from_string("LDAP_SERVER_FAST_BIND_OID","1.2.840.113556.1.4.1781");
|
||||
oid_add_from_string("LDAP_CAP_ACTIVE_DIRECTORY_LDAP_INTEG_OID","1.2.840.113556.1.4.1791");
|
||||
oid_add_from_string("msDS-ObjectReference","1.2.840.113556.1.4.1840");
|
||||
oid_add_from_string("msDS-QuotaEffective","1.2.840.113556.1.4.1848");
|
||||
oid_add_from_string("LDAP_CAP_ACTIVE_DIRECTORY_ADAM_OID","1.2.840.113556.1.4.1851");
|
||||
oid_add_from_string("LDAP_SERVER_QUOTA_CONTROL_OID","1.2.840.113556.1.4.1852");
|
||||
oid_add_from_string("msDS-PortSSL","1.2.840.113556.1.4.1860");
|
||||
oid_add_from_string("LDAP_SERVER_SHUTDOWN_NOTIFY_OID","1.2.840.113556.1.4.1907");
|
||||
oid_add_from_string("LDAP_SERVER_RANGE_RETRIEVAL_NOERR_OID","1.2.840.113556.1.4.1948");
|
||||
oid_add_from_string("msDS-isRODC","1.2.840.113556.1.4.1960");
|
||||
oid_add_from_string("msDS-SDReferenceDomain","1.2.840.113556.1.4.1711");
|
||||
oid_add_from_string("msDS-AdditionalDnsHostName","1.2.840.113556.1.4.1717");
|
||||
oid_add_from_string("None","1.3.6.1.4.1.1466.101.119.1");
|
||||
oid_add_from_string("LDAP_SERVER_FORCE_UPDATE_OID","1.2.840.113556.1.4.1974");
|
||||
oid_add_from_string("LDAP_SERVER_DN_INPUT_OID","1.2.840.113556.1.4.2026");
|
||||
oid_add_from_string("LDAP_SERVER_SHOW_RECYCLED_OID","1.2.840.113556.1.4.2064");
|
||||
oid_add_from_string("LDAP_SERVER_SHOW_DEACTIVATED_LINK_OID","1.2.840.113556.1.4.2065");
|
||||
oid_add_from_string("LDAP_SERVER_POLICY_HINTS_DEPRECATED_OID","1.2.840.113556.1.4.2066");
|
||||
oid_add_from_string("LDAP_SERVER_DIRSYNC_EX_OID","1.2.840.113556.1.4.2090");
|
||||
oid_add_from_string("LDAP_SERVER_TREE_DELETE_EX_OID","1.2.840.113556.1.4.2204");
|
||||
oid_add_from_string("LDAP_SERVER_UPDATE_STATS_OID","1.2.840.113556.1.4.2205");
|
||||
oid_add_from_string("LDAP_SERVER_SEARCH_HINTS_OID","1.2.840.113556.1.4.2206");
|
||||
oid_add_from_string("LDAP_SERVER_EXPECTED_ENTRY_COUNT_OID","1.2.840.113556.1.4.2211");
|
||||
oid_add_from_string("LDAP_SERVER_POLICY_HINTS_OID","1.2.840.113556.1.4.2239");
|
||||
oid_add_from_string("LDAP_SERVER_SET_OWNER_OID","1.2.840.113556.1.4.2255");
|
||||
oid_add_from_string("LDAP_SERVER_BYPASS_QUOTA_OID","1.2.840.113556.1.4.2256");
|
||||
oid_add_from_string("LDAP_SERVER_LINK_TTL_OID","1.2.840.113556.1.4.2309");
|
||||
oid_add_from_string("LDAP_SERVER_SET_CORRELATION_ID_OID","1.2.840.113556.1.4.2330");
|
||||
oid_add_from_string("LDAP_SERVER_THREAD_TRACE_OVERRIDE_OID","1.2.840.113556.1.4.2354");
|
||||
oid_add_from_string("DYNAMIC_REFRESH","1.3.6.1.4.1.1466.101.119.1");
|
||||
oid_add_from_string("LDAP_START_TLS_OID","1.3.6.1.4.1.1466.20037");
|
||||
|
||||
oid_add_from_string("inetOrgPerson", "2.16.840.1.113730.3.2.2");
|
||||
|
|
|
@ -2014,7 +2014,7 @@ SoundingRS-UL-ConfigDedicated/setup/duration STRINGS=TFS(<e_rrc_duration_val)
|
|||
/* Number of items is (last 3 bits of first byte and first bit of second) + 1 */
|
||||
guint16 number_of_records = ((tvb_get_ntohs(tvb, 0) >> 7) & 0x0f) + 1;
|
||||
%(DEFAULT_BODY)s
|
||||
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (%%u PagingRecords)", number_of_records);
|
||||
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (%%u PagingRecord%%s)", number_of_records, plurality(number_of_records, "", "s"));
|
||||
|
||||
#.FN_BODY Paging-v1310-IEs/systemInfoModification-eDRX-r13
|
||||
%(DEFAULT_BODY)s
|
||||
|
|
|
@ -1149,13 +1149,13 @@ SINR-RangeEUTRA DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_SINR_RangeEUTRA_fmt)
|
|||
MsgA-PUSCH-Config-r16/msgA-DeltaPreamble-r16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels
|
||||
|
||||
#.TYPE_ATTR
|
||||
MeasTriggerQuantityOffset/rsrp DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_dbm
|
||||
MeasTriggerQuantityOffset/rsrp DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_MeasTriggerQuantityOffset_fmt)
|
||||
|
||||
#.TYPE_ATTR
|
||||
MeasTriggerQuantityOffset/rsrq DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels
|
||||
MeasTriggerQuantityOffset/rsrq DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_MeasTriggerQuantityOffset_fmt)
|
||||
|
||||
#.TYPE_ATTR
|
||||
MeasTriggerQuantityOffset/sinr DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels
|
||||
MeasTriggerQuantityOffset/sinr DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_MeasTriggerQuantityOffset_fmt)
|
||||
|
||||
#.TYPE_ATTR
|
||||
ReselectionThreshold DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_ReselectionThreshold_fmt)
|
||||
|
|
|
@ -509,6 +509,14 @@ nr_rrc_SRS_RSRP_r16_fmt(gchar *s, guint32 v)
|
|||
}
|
||||
}
|
||||
|
||||
static void
|
||||
nr_rrc_MeasTriggerQuantityOffset_fmt(gchar *s, guint32 v)
|
||||
{
|
||||
gint32 d = (gint32)v;
|
||||
|
||||
g_snprintf(s, ITEM_LABEL_LENGTH, "%.1fdB (%d)", (float)d/2, d);
|
||||
}
|
||||
|
||||
#include "packet-nr-rrc-fn.c"
|
||||
|
||||
int
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue