Skip to content

Commit

Permalink
Merge branch 'dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
seladb authored Jun 17, 2024
2 parents 5071f9d + 18fb75f commit aa3e2aa
Show file tree
Hide file tree
Showing 125 changed files with 8,161 additions and 919 deletions.
2 changes: 1 addition & 1 deletion .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ task:
name: Test FreeBSD
freebsd_instance:
matrix:
image_family: freebsd-13-2
image_family: freebsd-13-3
image_family: freebsd-14-0
install_script:
- pkg install -y bash cmake git gmake gsed libpcap tcpreplay
Expand Down
6 changes: 6 additions & 0 deletions .github/ISSUE_TEMPLATE/blank.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
name: Blank issue
about: Report a issue with no specific category
---

(A clear and concise description of the issue.)
103 changes: 103 additions & 0 deletions .github/ISSUE_TEMPLATE/bug.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
name: Bug report
description: Submit a bug report
labels: ["bug"]
body:
- type: markdown
attributes:
value: |
**New to PcapPlusPlus?**
For help or advice on using PcapPlusPlus, try one of the following options instead of opening a GitHub issue:
- Post a message in PcapPlusPlus Google group: https://groups.google.com/d/forum/pcapplusplus-support
- Ask a question on Stack Overflow: https://stackoverflow.com/questions/tagged/pcapplusplus
- Send an email to: [email protected]
- Follow us on Twitter: https://twitter.com/seladb
Make sure to also search the [PcapPlusPlus issue tracker](https://github.com/seladb/PcapPlusPlus/issues) to check that the bug has not already been reported.
You can check more information about how to report a bug in the [PcapPlusPlus page](https://pcapplusplus.github.io/community#report-an-issue).
- type: textarea
attributes:
label: "Bug description"
description: >
Give a clear and concise description of what happened.
Include a [minimal, reproducible example](https://stackoverflow.com/help/minimal-reproducible-example) if possible.
[Copy and paste code where possible rather than using screenshots](https://meta.stackoverflow.com/a/285557/13990016),
and put any code blocks inside triple backticks.
value: |
**Describe the bug**
A clear and concise description of what the bug is.
**Code example to reproduce**
```cpp
// Add a code block here, if required
```
**Expected behavior**
A clear and concise description of what you expected to happen.
validations:
required: true
- type: dropdown
attributes:
label: "PcapPlusPlus versions tested on"
multiple: true
options:
- "PcapPlusPlus master branch"
- "v23.09"
- "v22.11"
- "v22.05"
- "v21.11"
- "v21.05"
- "Other (specify in the next question)"
validations:
required: true
- type: input
attributes:
label: "Other PcapPlusPlus version (if applicable)"
description: If you select "Other", please specify the version of PcapPlusPlus you tested on.
placeholder: ex. Build with commit hash 1234567
validations:
required: false
- type: dropdown
attributes:
label: "Operating systems tested on"
multiple: true
options:
- Linux
- macOS
- Windows
- FreeBSD
- Android
- Other (specify in the next question)
validations:
required: true
- type: input
attributes:
label: "Other operation systems (if applicable)"
description: If you select "Other", please specify the operation system you tested on.
placeholder: ex. ChromeOS, Solaris
validations:
required: false
- type: input
attributes:
label: "Compiler version"
description: Please specify the compiler version you used.
placeholder: ex. GCC 10.2.0
validations:
required: true
- type: dropdown
attributes:
label: "Packet capture backend (if applicable)"
multiple: true
options:
- libpcap
- PF_RING
- DPDK
- WinPcap
- Npcap
- XDP
- N/A
validations:
required: false
7 changes: 7 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
contact_links:
- name: "Contact the PcapPlusPlus team"
about: "For help or advice on using PcapPlusPlus, try one of the following options instead of opening a GitHub issue:"
url: "https://pcapplusplus.github.io/community"
- name: "Documentation"
about: "Check the PcapPlusPlus documentation for more information."
url: "https://pcapplusplus.github.io/ "
9 changes: 9 additions & 0 deletions .github/ISSUE_TEMPLATE/documentation.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
name: Documentation
about: Report a problem with the documentation
labels: "documentation"
---

# Documentation

(A clear and concise description of the issue.)
40 changes: 40 additions & 0 deletions .github/ISSUE_TEMPLATE/question.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: Question
description: Submit a question
labels: ["question"]
body:
- type: markdown
attributes:
value: |
# Asking a question
If you have a question about PcapPlusPlus, please check the following resources before opening a new issue:
- [PcapPlusPlus documentation](https://pcapplusplus.github.io/docs/quickstart)
- [PcapPlusPlus API reference](https://pcapplusplus.github.io/docs/api)
- [GitHub issues tracker](https://github.com/seladb/PcapPlusPlus/issues)
- type: textarea
attributes:
label: "Question"
description: >
Explain your question in detail.
value: |
```cpp
# Add a code block here, if required
```
validations:
required: true

- type: dropdown
attributes:
label: "Operating systems"
description: >
Select the operating systems that you are interested in.
multiple: true
options:
- Linux
- macOS
- Windows
- FreeBSD
- Android
- Other (specify in the question)
validations:
required: false
17 changes: 10 additions & 7 deletions .github/workflows/auto_update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,30 @@ name: Auto Update

on:
schedule:
- cron: '10 10 15 * *'
- cron: '0 0 1 * *' # Runs at 00:00, on day 1 of the month

permissions:
contents: read

jobs:
precommit-update:
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
with:
ref: dev
- name: Setup Python
uses: actions/setup-python@v5
uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
with:
python-version: "3.8.x"
- name: Run update
run: |
pip install pre-commit
pre-commit autoupdate
- name: Create Pull Request
uses: peter-evans/create-pull-request@v6
uses: peter-evans/create-pull-request@6d6857d36972b65feb161a90e484f2984215f83e # v6.0.5
with:
token: ${{ secrets.PAT }}
author: GitHub <[email protected]>
Expand All @@ -43,19 +46,19 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
with:
ref: dev
- name: Setup Python
uses: actions/setup-python@v5
uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
with:
python-version: "3.9.x"
- name: Run update
run: |
python3 3rdParty/OUIDataset/create_oui_data.py
mv -f PCPP_OUIDataset.json 3rdParty/OUIDataset/PCPP_OUIDataset.json
- name: Create Pull Request
uses: peter-evans/create-pull-request@v6
uses: peter-evans/create-pull-request@6d6857d36972b65feb161a90e484f2984215f83e # v6.0.5
with:
token: ${{ secrets.PAT }}
author: GitHub <[email protected]>
Expand Down
Loading

0 comments on commit aa3e2aa

Please sign in to comment.