Commitccce974

committed

Move connection dropping earlier than adding to poll lists in case server is disabled.

1 parentd218776 commitccce974Copy full SHA for ccce974

File tree

-8

lines changed

-8

lines changed

Lines changed: 8 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -418,8 +418,15 @@ static bool server_accept(server_t server) {`
`418`	`418`	`shout("failed to accept a connection: %s\n",strerror(errno));`
`419`	`419`	`return false;`
`420`	`420`	`}`
`421`		`-debug("a new connection accepted\n");`
	`421`	`+debug("a new connectionfd=%daccepted\n",fd);`
`422`	`422`
	`423`	`+if (!server->enabled) {`
	`424`	`+shout("server disabled, disconnecting the accepted connection fd=%d\n",fd);`
	`425`	`+// FIXME: redirect instead of disconnecting`
	`426`	`+close(fd);`
	`427`	`+return false;`
	`428`	`+}`
	`429`	`+`
`423`	`430`	`s=server->free_chain;`
`424`	`431`	`if (s==NULL) {`
`425`	`432`	`s=malloc(sizeof(stream_data_t));`
`@@ -430,13 +437,6 @@ static bool server_accept(server_t server) {`
`430`	`437`	`s->next=server->used_chain;`
`431`	`438`	`server->used_chain=s;`
`432`	`439`
`433`		`-if (!server->enabled) {`
`434`		`-shout("server disabled, disconnecting the accepted connection\n");`
`435`		`-// FIXME: redirect instead of disconnecting`
`436`		`-close(fd);`
`437`		`-return false;`
`438`		`-}`
`439`		`-`
`440`	`440`	`stream_init(s,fd);`
`441`	`441`
`442`	`442`	`returnserver_add_socket(server,fd,s);`

Comments

(0)