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

Initial AppleTalk fixes #1339

Merged
merged 1 commit into from
Jul 31, 2024
Merged

Initial AppleTalk fixes #1339

merged 1 commit into from
Jul 31, 2024

Conversation

NJRoadfan
Copy link
Contributor

@NJRoadfan NJRoadfan commented Jul 28, 2024

-Add pre-AFP 2.2 login strings.
-Add back GS/OS date preservation fix.
-Get the classic AppleTalk daemons working.
-Get the classic AppleTalk commandline tools working.

Fixes part of #1333

@NJRoadfan NJRoadfan marked this pull request as ready for review July 28, 2024 18:14
@NJRoadfan NJRoadfan requested a review from rdmark as a code owner July 28, 2024 18:14
@NJRoadfan NJRoadfan marked this pull request as draft July 28, 2024 21:27
@rdmark
Copy link
Member

rdmark commented Jul 28, 2024

@NJRoadfan Thank you for working on this. A minor housekeeping note: For PRs that target the main branch, let's not add the version number tag like [4.0]. They are only for distinguishing PRs against stable branches. Let's keep the tag soup manageable. ;)

I updated https://github.com/Netatalk/netatalk/wiki/Developer-Notes#pull-requests to make note of this.

@NJRoadfan NJRoadfan changed the title [4.0] Initial afpd fixes Initial afpd fixes Jul 29, 2024
@NJRoadfan
Copy link
Contributor Author

I've got a2boot and timelord compiling. Right now working on getting atalkd and papd working. After that, all that is left is getting afpd back to supporting ASP transports.

@NJRoadfan
Copy link
Contributor Author

NJRoadfan commented Jul 30, 2024

If anyone wants to test, you need to disable ASP from libatalk for now in order to compile with AppleTalk turned on. In libatalk/meson.build, remove line 25 subdir('asp') and line 30 libasp,. ASP is only used by afpd, which has not been hacked apart to support AppleTalk yet.

@NJRoadfan NJRoadfan changed the title Initial afpd fixes Initial AppleTalk fixes Jul 30, 2024
@NJRoadfan NJRoadfan marked this pull request as ready for review July 30, 2024 21:01
etc/papd/uam.c Outdated
@@ -60,8 +60,10 @@ struct uam_mod *uam_load(const char *path, const char *name)

/* version check would go here */

/* Temporary hack below to get this to compile with 3.x, we really should be passing an AFPObj as the first parameter */
Copy link
Member

Choose a reason for hiding this comment

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

Please prefix this with a TODO: so that it's easy to find later.

if have_appletalk
subdir('atalkd')
subdir('papd')
endif
Copy link
Member

Choose a reason for hiding this comment

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

Nitpick: Let's add a final newline for consistency. :)

@rdmark
Copy link
Member

rdmark commented Jul 30, 2024

@NJRoadfan Looks good overall. I left a few minor comments.

Can you please rebase this branch now so that it's a single commit, or a series of commits with atomic changes that compile independently? (reminder: git rebase -i HEAD~n where n is the number of commits that you want to squash.)

Many changes to integrate several of the old AppleTalk daemons and utilities into the 3.x codebase. Most of it was dealing with changes to libatalk's unicode conversion interface.

The following now compile and run:
-atalkd service (tested working)
-papd service (tested working)
-timelord service (runs, but not tested further)
-a2boot service (runs, but not tested further)
-nbplkup (tested working)
-nbprgstr (tested working)
-nbpunrgstr (tested working)
-getzones (tested working)

Note that as of now, atalkd, papd, and getzones are hardcoded to use the MAC_ROMAN character encoding. This was already the case on FreeBSD and platforms using systemd as they had no way to set and use the systemwide character sets anyway.
Copy link
Member

@rdmark rdmark left a comment

Choose a reason for hiding this comment

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

I’m good to merge this now. Please let me know if you are working on some final touches.

@NJRoadfan
Copy link
Contributor Author

Nothing further here.

@rdmark rdmark merged commit 37dc850 into Netatalk:main Jul 31, 2024
14 checks passed
@NJRoadfan NJRoadfan deleted the njroadfan-initial-compatibility-fixes branch July 31, 2024 01:18
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.

2 participants