1 files changed, 116 insertions, 19 deletions

diff --git a/src/nxt_upstream.c b/src/nxt_upstream.c
index e1615120..66b6619a 100644
--- a/src/nxt_upstream.c
+++ b/src/nxt_upstream.c
@@ -4,40 +4,137 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_main.h>
+#include <nxt_router.h>
+#include <nxt_http.h>
+#include <nxt_upstream.h>
 
 
-typedef struct {
-    void   (*peer_get)(nxt_upstream_peer_t *up);
-    void   (*peer_free)(nxt_upstream_peer_t *up);
-} nxt_upstream_name_t;
+static nxt_http_action_t *nxt_upstream_handler(nxt_task_t *task,
+    nxt_http_request_t *r, nxt_http_action_t *action);
 
 
-static const nxt_upstream_name_t  nxt_upstream_names[] = {
+nxt_int_t
+nxt_upstreams_create(nxt_task_t *task, nxt_router_temp_conf_t *tmcf,
+    nxt_conf_value_t *conf)
+{
+    size_t            size;
+    uint32_t          i, n, next;
+    nxt_mp_t          *mp;
+    nxt_int_t         ret;
+    nxt_str_t         name, *string;
+    nxt_upstreams_t   *upstreams;
+    nxt_conf_value_t  *upstreams_conf, *upcf;
+
+    static nxt_str_t  upstreams_name = nxt_string("upstreams");
+
+    upstreams_conf = nxt_conf_get_object_member(conf, &upstreams_name, NULL);
+
+    if (upstreams_conf == NULL) {
+        return NXT_OK;
+    }
+
+    n = nxt_conf_object_members_count(upstreams_conf);
+
+    if (n == 0) {
+        return NXT_OK;
+    }
+
+    mp = tmcf->router_conf->mem_pool;
+    size = sizeof(nxt_upstreams_t) + n * sizeof(nxt_upstream_t);
+
+    upstreams = nxt_mp_zalloc(mp, size);
+    if (nxt_slow_path(upstreams == NULL)) {
+        return NXT_ERROR;
+    }
+
+    upstreams->items = n;
+    next = 0;
+
+    for (i = 0; i < n; i++) {
+        upcf = nxt_conf_next_object_member(upstreams_conf, &name, &next);
+
+        string = nxt_str_dup(mp, &upstreams->upstream[i].name, &name);
+        if (nxt_slow_path(string == NULL)) {
+            return NXT_ERROR;
+        }
+
+        ret = nxt_upstream_round_robin_create(task, tmcf, upcf,
+                                              &upstreams->upstream[i]);
+        if (nxt_slow_path(ret != NXT_OK)) {
+            return NXT_ERROR;
+        }
+    }
+
+    tmcf->router_conf->upstreams = upstreams;
 
-    { "round_robin", &nxt_upstream_round_robin },
-};
+    return NXT_OK;
+}
 
 
 void
-nxt_upstream_create(nxt_upstream_peer_t *up)
+nxt_upstream_find(nxt_upstreams_t *upstreams, nxt_str_t *name,
+    nxt_http_action_t *action)
 {
-    /* TODO: dynamic balancer add & lvlhsh */
-    nxt_upstream_names[0].create(up);
+    uint32_t        i, n;
+    nxt_upstream_t  *upstream;
+
+    upstream = &upstreams->upstream[0];
+    n = upstreams->items;
+
+    for (i = 0; i < n; i++) {
+        if (nxt_strstr_eq(&upstream[i].name, name)) {
+            action->u.upstream_number = i;
+            action->handler = nxt_upstream_handler;
+
+            return;
+        }
+    }
 }
 
 
-void
-nxt_upstream_peer(nxt_upstream_peer_t *up)
+nxt_int_t
+nxt_upstreams_joint_create(nxt_router_temp_conf_t *tmcf,
+    nxt_upstream_t ***upstream_joint)
 {
-    nxt_upstream_t  *u;
+    uint32_t           i, n;
+    nxt_upstream_t     *u, **up;
+    nxt_upstreams_t    *upstreams;
+    nxt_router_conf_t  *router_conf;
+
+    router_conf = tmcf->router_conf;
+    upstreams = router_conf->upstreams;
+
+    if (upstreams == NULL) {
+        *upstream_joint = NULL;
+        return NXT_OK;
+    }
 
-    u = up->upstream;
+    n = upstreams->items;
 
-    if (u != NULL) {
-        u->peer_get(up);
-        return;
+    up = nxt_mp_zalloc(router_conf->mem_pool, n * sizeof(nxt_upstream_t *));
+    if (nxt_slow_path(up == NULL)) {
+        return NXT_ERROR;
     }
 
-    nxt_upstream_create(up);
+    u = &upstreams->upstream[0];
+
+    for (i = 0; i < n; i++) {
+        up[i] = u[i].proto->joint_create(tmcf, &u[i]);
+        if (nxt_slow_path(up[i] == NULL)) {
+            return NXT_ERROR;
+        }
+    }
+
+    *upstream_joint = up;
+
+    return NXT_OK;
+}
+
+
+static nxt_http_action_t *
+nxt_upstream_handler(nxt_task_t *task, nxt_http_request_t *r,
+    nxt_http_action_t *action)
+{
+    return nxt_upstream_proxy_handler(task, r,
+                              r->conf->upstreams[action->u.upstream_number]);
 }