Skip to content

Commit ca93409

Browse files
committed
HevSocks5Server: Use object base class in HevTaskSystem.
1 parent 97b33ae commit ca93409

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

src/hev-socks5-proxy.c

-4
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ hev_socks5_proxy_load_file (HevSocks5Authenticator *auth, const char *file)
6767
nlen = strlen (name);
6868
plen = strlen (pass);
6969
user = hev_socks5_user_mark_new (name, nlen, pass, plen, mark);
70-
hev_object_set_atomic (HEV_OBJECT (user), 1);
7170
res = hev_socks5_authenticator_add (auth, HEV_SOCKS5_USER (user));
7271
if (res < 0) {
7372
LOG_E ("socks5 proxy user conflict");
@@ -99,8 +98,6 @@ hev_socks5_proxy_load (void)
9998
if (!auth)
10099
return;
101100

102-
hev_object_set_atomic (HEV_OBJECT (auth), 1);
103-
104101
if (file) {
105102
hev_socks5_proxy_load_file (auth, file);
106103
} else {
@@ -109,7 +106,6 @@ hev_socks5_proxy_load (void)
109106
user = hev_socks5_user_mark_new (name, strlen (name), pass,
110107
strlen (pass), 0);
111108
hev_socks5_authenticator_add (auth, HEV_SOCKS5_USER (user));
112-
hev_object_set_atomic (HEV_OBJECT (user), 1);
113109
}
114110

115111
for (i = 0; i < workers; i++) {

src/hev-socks5-session.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ hev_socks5_session_destruct (HevObject *base)
126126

127127
LOG_D ("%p socks5 session destruct", self);
128128

129-
HEV_SOCKS5_SERVER_TYPE->finalizer (base);
129+
HEV_SOCKS5_SERVER_TYPE->destruct (base);
130130
}
131131

132132
HevObjectClass *
@@ -142,7 +142,7 @@ hev_socks5_session_class (void)
142142
memcpy (kptr, HEV_SOCKS5_SERVER_TYPE, sizeof (HevSocks5ServerClass));
143143

144144
okptr->name = "HevSocks5Session";
145-
okptr->finalizer = hev_socks5_session_destruct;
145+
okptr->destruct = hev_socks5_session_destruct;
146146

147147
skptr = HEV_SOCKS5_CLASS (kptr);
148148
skptr->binder = hev_socks5_session_bind;

src/hev-socks5-user-mark.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ hev_socks5_user_mark_destruct (HevObject *base)
6666

6767
LOG_D ("%p socks5 user mark destruct", self);
6868

69-
HEV_SOCKS5_USER_TYPE->finalizer (base);
69+
HEV_SOCKS5_USER_TYPE->destruct (base);
7070
}
7171

7272
HevObjectClass *
@@ -80,7 +80,7 @@ hev_socks5_user_mark_class (void)
8080
memcpy (kptr, HEV_SOCKS5_USER_TYPE, sizeof (HevSocks5UserClass));
8181

8282
okptr->name = "HevSocks5UserMark";
83-
okptr->finalizer = hev_socks5_user_mark_destruct;
83+
okptr->destruct = hev_socks5_user_mark_destruct;
8484
}
8585

8686
return okptr;

0 commit comments

Comments
 (0)