Simplify.

eclipse · Jun 23, 2014 · 7911db1 · 7911db1
1 parent bd2aa2f
commit 7911db1
Showing 1 changed file with 72 additions and 75 deletions.
diff --git a/src/net.c b/src/net.c
@@ -103,99 +103,96 @@ int mqtt3_socket_accept(struct mosquitto_db *db, int listensock)
  }
  COMPAT_CLOSE(new_sock);
  return -1;
- }else{
+ }
 #endif
- new_context = mqtt3_context_init(new_sock);
- if(!new_context){
- COMPAT_CLOSE(new_sock);
- return -1;
- }
- for(i=0; i<db->config->listener_count; i++){
- for(j=0; j<db->config->listeners[i].sock_count; j++){
- if(db->config->listeners[i].socks[j] == listensock){
- new_context->listener = &db->config->listeners[i];
- new_context->listener->client_count++;
- break;
- }
+ new_context = mqtt3_context_init(new_sock);
+ if(!new_context){
+ COMPAT_CLOSE(new_sock);
+ return -1;
+ }
+ for(i=0; i<db->config->listener_count; i++){
+ for(j=0; j<db->config->listeners[i].sock_count; j++){
+ if(db->config->listeners[i].socks[j] == listensock){
+ new_context->listener = &db->config->listeners[i];
+ new_context->listener->client_count++;
+ break;
  }
  }
- if(!new_context->listener){
- mqtt3_context_cleanup(NULL, new_context, true);
- return -1;
- }
+ }
+ if(!new_context->listener){
+ mqtt3_context_cleanup(NULL, new_context, true);
+ return -1;
+ }
 
-  if(new_context->listener->max_connections > 0 && new_context->listener->client_count > new_context->listener->max_connections){
-  _mosquitto_log_printf(NULL, MOSQ_LOG_NOTICE, "Client connection from %s denied: max_connections exceeded.", new_context->address);
-  mqtt3_context_cleanup(NULL, new_context, true);
-  return -1;
-  }
+ if(new_context->listener->max_connections > 0 && new_context->listener->client_count > new_context->listener->max_connections){
+ _mosquitto_log_printf(NULL, MOSQ_LOG_NOTICE, "Client connection from %s denied: max_connections exceeded.", new_context->address);
+ mqtt3_context_cleanup(NULL, new_context, true);
+ return -1;
+ }
 
 #ifdef WITH_TLS
- /* TLS init */
- for(i=0; i<db->config->listener_count; i++){
- for(j=0; j<db->config->listeners[i].sock_count; j++){
- if(db->config->listeners[i].socks[j] == listensock){
- if(db->config->listeners[i].ssl_ctx){
- new_context->ssl = SSL_new(db->config->listeners[i].ssl_ctx);
- if(!new_context->ssl){
- mqtt3_context_cleanup(NULL, new_context, true);
- return -1;
- }
- SSL_set_ex_data(new_context->ssl, tls_ex_index_context, new_context);
- SSL_set_ex_data(new_context->ssl, tls_ex_index_listener, &db->config->listeners[i]);
- new_context->want_write = true;
- bio = BIO_new_socket(new_sock, BIO_NOCLOSE);
- SSL_set_bio(new_context->ssl, bio, bio);
- rc = SSL_accept(new_context->ssl);
- if(rc != 1){
- rc = SSL_get_error(new_context->ssl, rc);
- if(rc == SSL_ERROR_WANT_READ){
- /* We always want to read. */
- }else if(rc == SSL_ERROR_WANT_WRITE){
- new_context->want_write = true;
- }else{
+ /* TLS init */
+ for(i=0; i<db->config->listener_count; i++){
+ for(j=0; j<db->config->listeners[i].sock_count; j++){
+ if(db->config->listeners[i].socks[j] == listensock){
+ if(db->config->listeners[i].ssl_ctx){
+ new_context->ssl = SSL_new(db->config->listeners[i].ssl_ctx);
+ if(!new_context->ssl){
+ mqtt3_context_cleanup(NULL, new_context, true);
+ return -1;
+ }
+ SSL_set_ex_data(new_context->ssl, tls_ex_index_context, new_context);
+ SSL_set_ex_data(new_context->ssl, tls_ex_index_listener, &db->config->listeners[i]);
+ new_context->want_write = true;
+ bio = BIO_new_socket(new_sock, BIO_NOCLOSE);
+ SSL_set_bio(new_context->ssl, bio, bio);
+ rc = SSL_accept(new_context->ssl);
+ if(rc != 1){
+ rc = SSL_get_error(new_context->ssl, rc);
+ if(rc == SSL_ERROR_WANT_READ){
+ /* We always want to read. */
+ }else if(rc == SSL_ERROR_WANT_WRITE){
+ new_context->want_write = true;
+ }else{
+ e = ERR_get_error();
+ while(e){
+ _mosquitto_log_printf(NULL, MOSQ_LOG_NOTICE,
+ "Client connection from %s failed: %s.",
+ new_context->address, ERR_error_string(e, ebuf));
  e = ERR_get_error();
- while(e){
- _mosquitto_log_printf(NULL, MOSQ_LOG_NOTICE,
- "Client connection from %s failed: %s.",
- new_context->address, ERR_error_string(e, ebuf));
- e = ERR_get_error();
- }
- mqtt3_context_cleanup(NULL, new_context, true);
- return -1;
  }
+ mqtt3_context_cleanup(NULL, new_context, true);
+ return -1;
  }
  }
  }
  }
  }
+ }
 #endif
 
- _mosquitto_log_printf(NULL, MOSQ_LOG_NOTICE, "New connection from %s on port %d.", new_context->address, new_context->listener->port);
- for(i=0; i<db->context_count; i++){
- if(db->contexts[i] == NULL){
- db->contexts[i] = new_context;
- break;
- }
+ _mosquitto_log_printf(NULL, MOSQ_LOG_NOTICE, "New connection from %s on port %d.", new_context->address, new_context->listener->port);
+ for(i=0; i<db->context_count; i++){
+ if(db->contexts[i] == NULL){
+ db->contexts[i] = new_context;
+ break;
  }
-  if(i==db->context_count){
-  tmp_contexts = _mosquitto_realloc(db->contexts, sizeof(struct mosquitto*)*(db->context_count+1));
-  if(tmp_contexts){
-  db->context_count++;
-  db->contexts = tmp_contexts;
-  db->contexts[i] = new_context;
- }else{
-  // Out of memory
-  mqtt3_context_cleanup(NULL, new_context, true);
-  return -1;
- }
+ }
+ if(i==db->context_count){
+ tmp_contexts = _mosquitto_realloc(db->contexts, sizeof(struct mosquitto*)*(db->context_count+1));
+ if(tmp_contexts){
+ db->context_count++;
+ db->contexts = tmp_contexts;
+ db->contexts[i] = new_context;
+ }else{
+ // Out of memory
+ mqtt3_context_cleanup(NULL, new_context, true);
+ return -1;
  }
- // If we got here then the context's DB index is "i" regardless of how we got here
- new_context->db_index = i;
-
-#ifdef WITH_WRAP
  }
-#endif
+ // If we got here then the context's DB index is "i" regardless of how we got here
+ new_context->db_index = i;
+
  return new_sock;
 }