Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

reorg: modular file reorganization of C source code - v9 #9973

Closed
wants to merge 41 commits into from

Conversation

jasonish
Copy link
Member

@jasonish jasonish commented Dec 5, 2023

Continuation of #9960.

This is the same is #9960, but fixes the util migration as a file went missing. Also conforms to CI's idea of clang-format.

Some tests still fail:

  • The template tests, fixing the template generation will need to be done manually, so will wait til we're 100% on the layout
  • Example plugin with standalone makefile as devel headers aren't installed correctly. This will probably have to be a manual update to the Makefile(s)
  • Somethings else are bound to fail.

Next steps:

  • app-layer/
  • output/eve
  • output/
  • util/
  • util/mpm/
  • sources/ (or capture?)
  • detect/

src/Makefile.am Outdated Show resolved Hide resolved
Comment on lines -3031 to +2898
AppLayerProtoDetectPPRegister(IPPROTO_TCP,
"85",
ALPROTO_FTP,
7, 15,
STREAM_TOSERVER,
ProbingParserDummyForTesting, NULL);
AppLayerProtoDetectPPRegister(IPPROTO_TCP, "80", ALPROTO_SMB, 5, 6, STREAM_TOSERVER,
ProbingParserDummyForTesting, NULL);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Compressions like this by clang-format are what caused the drop in line count.

@suricata-qa
Copy link

ERROR:

ERROR: QA failed on build_dbg.

Pipeline 16881

@ct0br0
Copy link

ct0br0 commented Dec 5, 2023

looks like git already picked it up below but

HEAD is now at c1bf95532 detect-engine: use ports only after edge case handling
Rebasing (1/36)
Rebasing (2/36)
Rebasing (3/36)
Rebasing (4/36)
Auto-merging src/detect-asn1.c
CONFLICT (content): Merge conflict in src/detect-asn1.c
Auto-merging src/detect-asn1.h
Auto-merging src/detect-engine-build.c
CONFLICT (content): Merge conflict in src/detect-engine-build.c
Auto-merging src/detect-engine-content-inspection.c
Auto-merging src/detect-engine-port.c
Auto-merging src/detect-engine-siggroup.c
Auto-merging src/detect.h
CONFLICT (content): Merge conflict in src/detect.h
error: could not apply 4ddd586ad... reorg: clang-format src/*
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".

@jasonish
Copy link
Member Author

jasonish commented Dec 5, 2023

looks like git already picked it up below but

HEAD is now at c1bf95532 detect-engine: use ports only after edge case handling
Rebasing (1/36)
Rebasing (2/36)
Rebasing (3/36)
Rebasing (4/36)
Auto-merging src/detect-asn1.c
CONFLICT (content): Merge conflict in src/detect-asn1.c
Auto-merging src/detect-asn1.h
Auto-merging src/detect-engine-build.c
CONFLICT (content): Merge conflict in src/detect-engine-build.c
Auto-merging src/detect-engine-content-inspection.c
Auto-merging src/detect-engine-port.c
Auto-merging src/detect-engine-siggroup.c
Auto-merging src/detect.h
CONFLICT (content): Merge conflict in src/detect.h
error: could not apply 4ddd586ad... reorg: clang-format src/*
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".

Yes, this work is non-rebaseable.

@suricata-qa
Copy link

Information: QA ran without warnings.

Pipeline 16888

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

4 participants