Manually bind MyProcPort #2162
Open
Manually bind MyProcPort #2162
+100
−0
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
workingjubilee
force-pushed
the
add-myprocport
branch
2 times, most recently
from
a3856b9 to
1477ed3
Compare
workingjubilee
force-pushed
the
add-myprocport
branch
from
1477ed3 to
9e613a3
Compare
cbandy
reviewed
Oct 25, 2025
| @@ -0,0 +1,98 @@ | |||
| /** Manually-constructed bindings to libpq | |||
|
|
|||
| Because pgrx is for extensions which run in the Postgres server, it rarely needs access to libpq. | |||
|
|
||
| /// #define SCRAM_MAX_KEY_LEN PG_SHA256_DIGEST_LENGTH | ||
| /// #define PG_SHA256_DIGEST_LENGTH 32 | ||
| const SCRAM_MAX_KEY_LEN: usize = 32; |
Comment on lines
+35
to
+38
| #[cfg(any(feature = "pg13", feature = "pg14", feature = "pg15", feature = "pg16"))] | ||
| pub canAcceptConnections: core::ffi::c_uint, | ||
| #[cfg(feature = "pg18")] | ||
| pub local_host: [core::ffi::c_char; 64], |
| HbaLine: *mut core::ffi::c_void, | ||
|
|
||
| #[cfg(any(feature = "pg14", feature = "pg15"))] | ||
| authn_id: *const core::ffi::c_char, |
Comment on lines
+72
to
+75
| ssl_in_use: bool, | ||
| peer_cn: *mut core::ffi::c_char, | ||
| peer_dn: *mut core::ffi::c_char, | ||
| peer_cert_valid: bool, |
There was a problem hiding this comment.
🔧 pg13 lacks peer_dn here. https://github.com/postgres/postgres/blob/REL_13_0/src/include/libpq/libpq-be.h#L187
Suggested change
| ssl_in_use: bool, | |
| peer_cn: *mut core::ffi::c_char, | |
| peer_dn: *mut core::ffi::c_char, | |
| peer_cert_valid: bool, | |
| ssl_in_use: bool, | |
| peer_cn: *mut core::ffi::c_char, | |
| #[cfg(any(feature = "pg14", feature = "pg15", feature = "pg16", feature = "pg17", feature = "pg18"))] | |
| peer_dn: *mut core::ffi::c_char, | |
| peer_cert_valid: bool, |
There was a problem hiding this comment.
Ah, thank you. Missed that one.
Comment on lines
+77
to
+78
| #[cfg(any(feature = "pg18", feature = "pg17"))] | ||
| alpn_used: bool, |
There was a problem hiding this comment.
⛏️ nit
Suggested change
| #[cfg(any(feature = "pg18", feature = "pg17"))] | |
| alpn_used: bool, | |
| #[cfg(any(feature = "pg17", feature = "pg18"))] | |
| alpn_used: bool, |
| #[cfg(any(feature = "pg18", feature = "pg17"))] | ||
| alpn_used: bool, | ||
| #[cfg(feature = "pg18")] | ||
| last_read_was_eof: bool, |
Comment on lines
+85
to
+89
| // as if USE_OPENSSL == false && ENABLE_SSPI == false | ||
| #[cfg(feature = "pg18")] | ||
| ssl: *mut core::ffi::c_void, | ||
| #[cfg(feature = "pg18")] | ||
| peer: *mut core::ffi::c_void, |
There was a problem hiding this comment.
🤔 I see only USE_OPENSSL affecting these. https://github.com/postgres/postgres/blob/REL_18_0/src/include/libpq/libpq-be.h#L215
Suggested change
| // as if USE_OPENSSL == false && ENABLE_SSPI == false | |
| #[cfg(feature = "pg18")] | |
| ssl: *mut core::ffi::c_void, | |
| #[cfg(feature = "pg18")] | |
| peer: *mut core::ffi::c_void, | |
| // as if USE_OPENSSL == false | |
| #[cfg(feature = "pg18")] | |
| ssl: *mut core::ffi::c_void, | |
| #[cfg(feature = "pg18")] | |
| peer: *mut core::ffi::c_void, |
There was a problem hiding this comment.
think that was a copypaste error, yeah.
Comment on lines
+91
to
+96
| #[cfg(feature = "pg18")] | ||
| raw_buf: *mut core::ffi::c_char, | ||
| #[cfg(feature = "pg18")] | ||
| raw_buf_consumed: isize, | ||
| #[cfg(feature = "pg18")] | ||
| raw_buf_remaining: isize, |
| last_read_was_eof: bool, | ||
|
|
||
| // NOTE: 5 fields remain on PG17, but two are `#ifdef USE_OPENSSL` in PG17, so treat all | ||
| // as conditioned on PG18, even if that is not strictly accurate for PG17 |
There was a problem hiding this comment.
🤔 So we're too small in pg17. I'm not sure what to do about that or how to better explain it to the reader. 👍🏻
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is effectively my proposed alternative to #2117, building on @usamoi's suggestion.
Fixes #2157
cc @cbandy