Skip to content

vmysql: expand remote_ip to store IPv6 #16

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.

Sign up for GitHub

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

Open
msimerson wants to merge 2 commits into
base: main
Choose a base branch
from
Open

vmysql: expand remote_ip to store IPv6 #16

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc2ea78
vmysql: expand remote_ip to store IPv6
msimerson Dec 6, 2024
f4cad7c
also update ip_addr fields to 39 bytes
msimerson Dec 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions vmysql.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,13 @@ primary key (pw_name ) "
#endif
#endif

#define RELAY_TABLE_LAYOUT "ip_addr char(18) not null, \
#define RELAY_TABLE_LAYOUT "ip_addr varchar(39) not null, \
timestamp char(12), primary key (ip_addr)"

#define LASTAUTH_TABLE_LAYOUT \
"user char(32) NOT NULL, \
"user char(64) NOT NULL, \
domain char(96) NOT NULL,\
remote_ip char(18) not null, \
remote_ip varchar(39) not null, \
timestamp bigint default 0 NOT NULL, \
primary key (user, domain)"

Expand Down Expand Up @@ -225,7 +225,7 @@ where pw_name = \"%s\" "
#endif

#ifdef IP_ALIAS_DOMAINS
#define IP_ALIAS_TABLE_LAYOUT "ip_addr char(18) not null, domain char(96), primary key(ip_addr)"
#define IP_ALIAS_TABLE_LAYOUT "ip_addr varchar(39) not null, domain char(96), primary key(ip_addr)"
#endif

#define DIR_CONTROL_TABLE_LAYOUT "domain char(96) not null, cur_users int, \
Expand Down Expand Up @@ -264,9 +264,9 @@ INDEX (alias, domain)"

#ifdef ENABLE_SQL_LOGGING
#define VLOG_TABLE_LAYOUT "id BIGINT PRIMARY KEY AUTO_INCREMENT, \
user char(32), passwd CHAR(32), \
user char(64), passwd CHAR(32), \
domain CHAR(96), logon VARCHAR(200), \
remoteip char(18), message VARCHAR(255), \
remoteip varchar(39), message VARCHAR(255), \
timestamp bigint default 0 NOT NULL, error INT, \
INDEX user_idx (user), \
INDEX domain_idx (domain), INDEX remoteip_idx (remoteip), \
Expand Down