Skip to content

Commit c0b41d0

Browse files
authored
Merge pull request #115 from cgzones/style
Indentation and typo fixes
2 parents a7c6b83 + c6147b3 commit c0b41d0

File tree

5 files changed

+28
-28
lines changed

5 files changed

+28
-28
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ LogFormat=rfc5424
132132
StructuredData=[1ab456b6-90bb-6578-abcd-5b734584aaaa@41058]
133133
```
134134

135-
Example 4. Custom syslog structrued data and message ID
135+
Example 4. Custom syslog structured data and message ID
136136

137137
``` toml
138138
[Network]

src/netlog/netlog-conf.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ int config_parse_netlog_remote_address(const char *unit,
3737
.ai_socktype = SOCK_DGRAM,
3838
.ai_family = socket_ipv6_is_supported() ? AF_UNSPEC : AF_INET,
3939
};
40-
uint32_t u;
40+
uint32_t u;
4141

4242
e = strchr(rvalue, ':');
4343
if (e) {

src/netlog/netlog-dtls.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -70,18 +70,18 @@ int dtls_connect(DTLSManager *m, SocketAddress *address) {
7070
switch (address->sockaddr.sa.sa_family) {
7171
case AF_INET:
7272
sa = (union sockaddr_union) {
73-
.in.sin_family = address->sockaddr.sa.sa_family,
74-
.in.sin_port = address->sockaddr.in.sin_port,
75-
.in.sin_addr = address->sockaddr.in.sin_addr,
76-
};
73+
.in.sin_family = address->sockaddr.sa.sa_family,
74+
.in.sin_port = address->sockaddr.in.sin_port,
75+
.in.sin_addr = address->sockaddr.in.sin_addr,
76+
};
7777
salen = sizeof(sa.in);
7878
break;
7979
case AF_INET6:
8080
sa = (union sockaddr_union) {
81-
.in6.sin6_family = address->sockaddr.sa.sa_family,
82-
.in6.sin6_port = address->sockaddr.in6.sin6_port,
83-
.in6.sin6_addr = address->sockaddr.in6.sin6_addr,
84-
};
81+
.in6.sin6_family = address->sockaddr.sa.sa_family,
82+
.in6.sin6_port = address->sockaddr.in6.sin6_port,
83+
.in6.sin6_addr = address->sockaddr.in6.sin6_addr,
84+
};
8585
salen = sizeof(sa.in6);
8686
break;
8787
default:
@@ -123,7 +123,7 @@ int dtls_connect(DTLSManager *m, SocketAddress *address) {
123123
SSL_set_bio(ssl, bio, bio);
124124
m->bio = TAKE_PTR(bio);
125125

126-
/* Cerification verification */
126+
/* Certification verification */
127127
if (m->auth_mode != OPEN_SSL_CERTIFICATE_AUTH_MODE_NONE && m->auth_mode != OPEN_SSL_CERTIFICATE_AUTH_MODE_INVALID) {
128128
log_debug("DTLS: enable certificate verification");
129129

src/netlog/netlog-network.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -145,18 +145,18 @@ int manager_network_connect_socket(Manager *m) {
145145
switch (m->address.sockaddr.sa.sa_family) {
146146
case AF_INET:
147147
sa = (union sockaddr_union) {
148-
.in.sin_family = m->address.sockaddr.sa.sa_family,
149-
.in.sin_port = m->address.sockaddr.in.sin_port,
150-
.in.sin_addr = m->address.sockaddr.in.sin_addr,
151-
};
148+
.in.sin_family = m->address.sockaddr.sa.sa_family,
149+
.in.sin_port = m->address.sockaddr.in.sin_port,
150+
.in.sin_addr = m->address.sockaddr.in.sin_addr,
151+
};
152152
salen = sizeof(sa.in);
153153
break;
154154
case AF_INET6:
155155
sa = (union sockaddr_union) {
156-
.in6.sin6_family = m->address.sockaddr.sa.sa_family,
157-
.in6.sin6_port = m->address.sockaddr.in6.sin6_port,
158-
.in6.sin6_addr = m->address.sockaddr.in6.sin6_addr,
159-
};
156+
.in6.sin6_family = m->address.sockaddr.sa.sa_family,
157+
.in6.sin6_port = m->address.sockaddr.in6.sin6_port,
158+
.in6.sin6_addr = m->address.sockaddr.in6.sin6_addr,
159+
};
160160
salen = sizeof(sa.in6);
161161
break;
162162
default:

src/netlog/netlog-tls.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -174,18 +174,18 @@ int tls_connect(TLSManager *m, SocketAddress *address) {
174174
switch (address->sockaddr.sa.sa_family) {
175175
case AF_INET:
176176
sa = (union sockaddr_union) {
177-
.in.sin_family = address->sockaddr.sa.sa_family,
178-
.in.sin_port = address->sockaddr.in.sin_port,
179-
.in.sin_addr = address->sockaddr.in.sin_addr,
180-
};
177+
.in.sin_family = address->sockaddr.sa.sa_family,
178+
.in.sin_port = address->sockaddr.in.sin_port,
179+
.in.sin_addr = address->sockaddr.in.sin_addr,
180+
};
181181
salen = sizeof(sa.in);
182182
break;
183183
case AF_INET6:
184184
sa = (union sockaddr_union) {
185-
.in6.sin6_family = address->sockaddr.sa.sa_family,
186-
.in6.sin6_port = address->sockaddr.in6.sin6_port,
187-
.in6.sin6_addr = address->sockaddr.in6.sin6_addr,
188-
};
185+
.in6.sin6_family = address->sockaddr.sa.sa_family,
186+
.in6.sin6_port = address->sockaddr.in6.sin6_port,
187+
.in6.sin6_addr = address->sockaddr.in6.sin6_addr,
188+
};
189189
salen = sizeof(sa.in6);
190190
break;
191191
default:
@@ -221,7 +221,7 @@ int tls_connect(TLSManager *m, SocketAddress *address) {
221221
return log_error_errno(SYNTHETIC_ERRNO(EIO),
222222
"TLS: Failed to SSL_set_fd: %s",
223223
ERR_error_string(ERR_get_error(), NULL));
224-
/* Cerification verification */
224+
/* Certification verification */
225225
if (m->auth_mode != OPEN_SSL_CERTIFICATE_AUTH_MODE_NONE && m->auth_mode != OPEN_SSL_CERTIFICATE_AUTH_MODE_INVALID) {
226226
log_debug("TLS: enable certificate verification");
227227

0 commit comments

Comments
 (0)