aljaz/ttyd
1
1
Fork 0
mirror of https://github.com/tsl0922/ttyd.git synced 2025-12-23 04:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reformat C source files

Browse Source
This commit is contained in:
Shuanglei Tao
2016-12-21 22:50:23 +08:00
parent dcacbd25af
commit 085f6d54db
3 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/http.c
View File

@@ -82,7 +82,7 @@ callback_http(struct lws *wsi, enum lws_callback_reasons reason, void *user, voi
p = buffer + LWS_PRE; p = buffer + LWS_PRE;
end = p + sizeof(buffer) - LWS_PRE; end = p + sizeof(buffer) - LWS_PRE;
if (!strncmp((const char *)in, "/auth_token.js", 14)) { if (!strncmp((const char *) in, "/auth_token.js", 14)) {
size_t n = server->credential != NULL ? sprintf(buf, "var tty_auth_token = '%s';", server->credential) : 0; size_t n = server->credential != NULL ? sprintf(buf, "var tty_auth_token = '%s';", server->credential) : 0;
if (lws_add_http_header_status(wsi, HTTP_STATUS_OK, &p, end)) if (lws_add_http_header_status(wsi, HTTP_STATUS_OK, &p, end))
@@ -128,10 +128,10 @@ callback_http(struct lws *wsi, enum lws_callback_reasons reason, void *user, voi
return 1; return 1;
goto try_to_reuse; goto try_to_reuse;
case LWS_CALLBACK_OPENSSL_PERFORM_CLIENT_CERT_VERIFICATION: case LWS_CALLBACK_OPENSSL_PERFORM_CLIENT_CERT_VERIFICATION:
if (!len || (SSL_get_verify_result((SSL*)in) != X509_V_OK)) { if (!len || (SSL_get_verify_result((SSL *) in) != X509_V_OK)) {
int err = X509_STORE_CTX_get_error((X509_STORE_CTX*)user); int err = X509_STORE_CTX_get_error((X509_STORE_CTX *) user);
int depth = X509_STORE_CTX_get_error_depth((X509_STORE_CTX*)user); int depth = X509_STORE_CTX_get_error_depth((X509_STORE_CTX *) user);
const char* msg = X509_verify_cert_error_string(err); const char *msg = X509_verify_cert_error_string(err);
lwsl_err("client certificate verification error: %s (%d), depth: %d\n", msg, err, depth); lwsl_err("client certificate verification error: %s (%d), depth: %d\n", msg, err, depth);
return 1; return 1;
} }

2
src/protocol.c
View File

@@ -255,7 +255,7 @@ callback_tty(struct lws *wsi, enum lws_callback_reasons reason,
t_free(frame->data); t_free(frame->data);
t_free(frame); t_free(frame);
if(lws_partial_buffered(wsi)){ if (lws_partial_buffered(wsi)) {
lws_callback_on_writable(wsi); lws_callback_on_writable(wsi);
break; break;
} }

40
src/server.c
View File

@@ -22,24 +22,24 @@ static const struct lws_extension extensions[] = {
// command line options // command line options
static const struct option options[] = { static const struct option options[] = {
{"port", required_argument, NULL, 'p'}, {"port", required_argument, NULL, 'p'},
{"interface", required_argument, NULL, 'i'}, {"interface", required_argument, NULL, 'i'},
{"credential", required_argument, NULL, 'c'}, {"credential", required_argument, NULL, 'c'},
{"uid", required_argument, NULL, 'u'}, {"uid", required_argument, NULL, 'u'},
{"gid", required_argument, NULL, 'g'}, {"gid", required_argument, NULL, 'g'},
{"signal", required_argument, NULL, 's'}, {"signal", required_argument, NULL, 's'},
{"reconnect", required_argument, NULL, 'r'}, {"reconnect", required_argument, NULL, 'r'},
{"ssl", no_argument, NULL, 'S'}, {"ssl", no_argument, NULL, 'S'},
{"ssl-cert", required_argument, NULL, 'C'}, {"ssl-cert", required_argument, NULL, 'C'},
{"ssl-key", required_argument, NULL, 'K'}, {"ssl-key", required_argument, NULL, 'K'},
{"ssl-ca", required_argument, NULL, 'A'}, {"ssl-ca", required_argument, NULL, 'A'},
{"readonly", no_argument, NULL, 'R'}, {"readonly", no_argument, NULL, 'R'},
{"check-origin", no_argument, NULL, 'O'}, {"check-origin", no_argument, NULL, 'O'},
{"once", no_argument, NULL, 'o'}, {"once", no_argument, NULL, 'o'},
{"debug", required_argument, NULL, 'd'}, {"debug", required_argument, NULL, 'd'},
{"version", no_argument, NULL, 'v'}, {"version", no_argument, NULL, 'v'},
{"help", no_argument, NULL, 'h'}, {"help", no_argument, NULL, 'h'},
{NULL, 0, 0, 0} {NULL, 0, 0, 0}
}; };
static const char *opt_string = "p:i:c:u:g:s:r:aSC:K:A:Rt:Ood:vh"; static const char *opt_string = "p:i:c:u:g:s:r:aSC:K:A:Rt:Ood:vh";
@@ -279,8 +279,8 @@ main(int argc, char **argv) {
break; break;
case 't': case 't':
optind--; optind--;
for(;optind < start && *argv[optind] != '-'; optind++){ for (; optind < start && *argv[optind] != '-'; optind++) {
char *option =strdup(optarg); char *option = strdup(optarg);
char *key = strsep(&option, "="); char *key = strsep(&option, "=");
if (key == NULL) { if (key == NULL) {
fprintf(stderr, "ttyd: invalid client option: %s, format: key=value\n", optarg); fprintf(stderr, "ttyd: invalid client option: %s, format: key=value\n", optarg);