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

antiblock: add new package #25694

Merged
merged 1 commit into from
Jan 17, 2025
Merged

Conversation

karen07
Copy link
Contributor

@karen07 karen07 commented Jan 7, 2025

Maintainer: me
Compile tested: ASUS RT-AX59U 23.05.5, ASUS RT-AX53U 23.05.5, OpenWrt x86
Run tested: ASUS RT-AX59U 23.05.5, ASUS RT-AX53U 23.05.5, OpenWrt x86

Description:
AntiBlock program proxies DNS requests. The IP addresses of the specified domains are added to the routing table for routing through the specified interface.

net/antiblock/test.sh Outdated Show resolved Hide resolved
@mwarning
Copy link
Contributor

mwarning commented Jan 8, 2025

@1715173329 hi, do you know why the pipeline is not started here? It says "2 workflows awaiting approval " here. Can you help?

@1715173329
Copy link
Member

1715173329 commented Jan 9, 2025

@1715173329 hi, do you know why the pipeline is not started here? It says "2 workflows awaiting approval " here.

fyi https://docs.github.com/en/actions/managing-workflow-runs-and-deployments/managing-workflow-runs/approving-workflow-runs-from-public-forks#about-workflow-runs-from-public-forks

By default, all first-time contributors require approval to run workflows.

@karen07
Copy link
Contributor Author

karen07 commented Jan 9, 2025

@1715173329 hi, do you know why the pipeline is not started here? It says "2 workflows awaiting approval " here.

fyi https://docs.github.com/en/actions/managing-workflow-runs-and-deployments/managing-workflow-runs/approving-workflow-runs-from-public-forks#about-workflow-runs-from-public-forks

By default, all first-time contributors require approval to run workflows.

"The hosted runner: GitHub Actions 17 lost communication with the server. Anything in your workflow that terminates the runner process, starves it for CPU/Memory, or blocks its network access can cause this error."

How can I start again?

@mwarning
Copy link
Contributor

mwarning commented Jan 9, 2025

@karen07 I do not think you need to run again. Your package has likely nothing to do with the problem (my pipeline run also tend to be red). Let's wait for a developer.

net/antiblock/Makefile Outdated Show resolved Hide resolved
net/antiblock/Makefile Outdated Show resolved Hide resolved
net/antiblock/files/etc/init.d/antiblock Outdated Show resolved Hide resolved
net/antiblock/files/etc/init.d/antiblock Outdated Show resolved Hide resolved
net/antiblock/files/etc/init.d/antiblock Outdated Show resolved Hide resolved
@karen07
Copy link
Contributor Author

karen07 commented Jan 9, 2025

@1715173329 what is the best way to upload changes so that there is only one commit in the branch?

@1715173329
Copy link
Member

Just use amend + force push

@mwarning
Copy link
Contributor

mwarning commented Jan 9, 2025

@1715173329 what is the best way to upload changes so that there is only one commit in the branch?

As @1715173329 mentioned. Use git add Makefile --amend and then git push --force.

@karen07 karen07 force-pushed the add-antiblock-new branch from e4dc527 to 5e5941c Compare January 9, 2025 12:39
@1715173329
Copy link
Member

Description:
AntiBlock program proxies DNS requests. The IP addresses of the specified domains are added to the routing table for routing through the specified interface.

Please add the description to commit message as well, otherwise LGTM.

@karen07 karen07 force-pushed the add-antiblock-new branch 2 times, most recently from e6f0eab to 80dcfba Compare January 9, 2025 15:48
@1715173329
Copy link
Member

please do not write description just after the commit title (subject), instead, leave a new blank line, then add the description (commit message), and wrap a new line for every 70 chars as well.

it should be look like this:
image

@1715173329
Copy link
Member

1715173329 commented Jan 9, 2025

After that please allow a few days for other maintainers to leave reviews (if any).

@karen07 karen07 force-pushed the add-antiblock-new branch from 80dcfba to 33f35b1 Compare January 9, 2025 16:40
@karen07 karen07 force-pushed the add-antiblock-new branch 4 times, most recently from 1846b9d to 9dffa8b Compare January 11, 2025 07:45
@egc112
Copy link
Contributor

egc112 commented Jan 12, 2025

For my understanding, how is this different then e.g. a PBR package which can route domains or IP address through a specific interface?

@karen07
Copy link
Contributor Author

karen07 commented Jan 12, 2025

For my understanding, how is this different then e.g. a PBR package which can route domains or IP address through a specific interface?

My solution is written from scratch in C. It does not entail dependence. It takes up little space. Easy to set up. Uses little RAM. It also has a LUCI-GUI, I'll fill it in later.

You can set the URL to the domains file to the program, which we will send via VPN. You can set the path to the domains file to the program, which we will send via VPN. The URL and File will be re-read every 24 hours.

My configuration example:

config antiblock
	option url 'https://antifilter.download/list/domains.lst'
	option file '/root/my_urls.txt'
	option DNS '127.0.0.1:5060'
	option listen '127.0.0.1:5053'
	option VPN_name 'VPN'

net/antiblock/Makefile Outdated Show resolved Hide resolved
@mwarning
Copy link
Contributor

@karen07 it looks OK to me now. but the package hash is wrong. See pipeline failures.

@karen07
Copy link
Contributor Author

karen07 commented Jan 12, 2025

@karen07 it looks OK to me now. but the package hash is wrong. See pipeline failures.

Yes, I need to upgrade to the git release archive. I will deal with the releases.

@karen07
Copy link
Contributor Author

karen07 commented Jan 13, 2025

@BKPepe @mwarning @1715173329 Is there anything else i need to fix?

@mwarning
Copy link
Contributor

mwarning commented Jan 13, 2025

@BKPepe @mwarning @1715173329 Is there anything else i need to fix?

Looks good to me.

net/antiblock/files/etc/init.d/antiblock Outdated Show resolved Hide resolved
net/antiblock/files/etc/init.d/antiblock Outdated Show resolved Hide resolved
AntiBlock program proxies DNS requests.
The IP addresses of the specified domains are added to
the routing table for routing through the specified interface.

Signed-off-by: Khachatryan Karen <[email protected]>
@karen07
Copy link
Contributor Author

karen07 commented Jan 16, 2025

@BKPepe Is there anything else i need to fix?

@1715173329 1715173329 merged commit 64f1a28 into openwrt:master Jan 17, 2025
12 checks passed
@1715173329
Copy link
Member

Merged, thank you!

@karen07
Copy link
Contributor Author

karen07 commented Jan 17, 2025

@1715173329 Thank you very much
How do I get to 24.10?

@mwarning
Copy link
Contributor

@karen07 create a MR based on the openwrt-24.10 packages branch and do "git cherry-pick -x 64f1a28"

@karen07 karen07 deleted the add-antiblock-new branch January 17, 2025 08:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants