Skip to content

Commit 0a5f6bf

Browse files
author
Alexey Suslov
committed
Follow the upstream introduced struct sockaddr_storage
1 parent 7db244c commit 0a5f6bf

1 file changed

Lines changed: 3 additions & 11 deletions

File tree

src/plugins/BoundAuthPlugin/BoundAuth.c

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -123,14 +123,6 @@ static void StringizeBytes(const uint8_t *data, const size_t len, const char *al
123123
}
124124
}
125125

126-
typedef
127-
#ifdef NOIPV6
128-
struct sockaddr_in
129-
#else
130-
struct sockaddr_in6
131-
#endif
132-
sockaddr_used;
133-
134126
/**
135127
* Two-factor HMAC is supported, if `secret' is set in server configs. This is completely optional.
136128
* pw_single = HMAC(pw_private, ip)
@@ -140,7 +132,7 @@ sockaddr_used;
140132
* @param [in] addr
141133
* @param [out] pw_public Stringized `pw_signle' or `pw_double', depending on config.
142134
*/
143-
static void PasswordBoundize(const char *pw_private, sockaddr_used *addr, char *pw_public) {
135+
static void PasswordBoundize(const char *pw_private, struct sockaddr_storage *addr, char *pw_public) {
144136
uint8_t pw_single[PICOHASH_SHA256_DIGEST_LENGTH];
145137
uint8_t pw_double[PICOHASH_SHA256_DIGEST_LENGTH];
146138
uint8_t *pw_hmac = pw_single;
@@ -160,7 +152,7 @@ static void PasswordBoundize(const char *pw_private, sockaddr_used *addr, char *
160152
StringizeBytes(pw_hmac, sizeof(pw_single), PluginConfig.alphabet.data, PluginConfig.alphabet.len, pw_public, PluginConfig.len);
161153
}
162154

163-
static bool PasswordCheck(const char *pw_public, sockaddr_used *addr, const char *pw_private) {
155+
static bool PasswordCheck(const char *pw_public, struct sockaddr_storage *addr, const char *pw_private) {
164156
if (strlen(pw_public) != PluginConfig.len) {
165157
return false;
166158
}
@@ -263,7 +255,7 @@ PLUGINAPI int PLUGINCALL ConvertPassword(struct pluginlink *link, int argc, char
263255
}
264256
const char *pw_private = argv[1];
265257
const char *addr_string = argv[2];
266-
sockaddr_used addr = {0};
258+
struct sockaddr_storage addr = {0};
267259
uint16_t addr_family;
268260
if (strchr(addr_string, '.') != NULL && strchr(addr_string, ':') == NULL) {
269261
addr_family = AF_INET;

0 commit comments

Comments
 (0)