Deleted Added
full compact
ctld.h (279006) ctld.h (279055)
1/*-
2 * Copyright (c) 2012 The FreeBSD Foundation
3 * All rights reserved.
4 *
5 * This software was developed by Edward Tomasz Napierala under sponsorship
6 * from the FreeBSD Foundation.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 12 unchanged lines hidden (view full) ---

21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
1/*-
2 * Copyright (c) 2012 The FreeBSD Foundation
3 * All rights reserved.
4 *
5 * This software was developed by Edward Tomasz Napierala under sponsorship
6 * from the FreeBSD Foundation.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 12 unchanged lines hidden (view full) ---

21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
29 * $FreeBSD: stable/10/usr.sbin/ctld/ctld.h 279006 2015-02-19 14:52:01Z mav $
29 * $FreeBSD: stable/10/usr.sbin/ctld/ctld.h 279055 2015-02-20 17:09:49Z mav $
30 */
31
32#ifndef CTLD_H
33#define CTLD_H
34
35#include <sys/queue.h>
36#ifdef ICL_KERNEL_PROXY
37#include <sys/types.h>

--- 82 unchanged lines hidden (view full) ---

120 bool pg_unassigned;
121 TAILQ_HEAD(, portal) pg_portals;
122 TAILQ_HEAD(, port) pg_ports;
123 char *pg_redirection;
124
125 uint16_t pg_tag;
126};
127
30 */
31
32#ifndef CTLD_H
33#define CTLD_H
34
35#include <sys/queue.h>
36#ifdef ICL_KERNEL_PROXY
37#include <sys/types.h>

--- 82 unchanged lines hidden (view full) ---

120 bool pg_unassigned;
121 TAILQ_HEAD(, portal) pg_portals;
122 TAILQ_HEAD(, port) pg_ports;
123 char *pg_redirection;
124
125 uint16_t pg_tag;
126};
127
128struct pport {
129 TAILQ_ENTRY(pport) pp_next;
130 TAILQ_HEAD(, port) pp_ports;
131 struct conf *pp_conf;
132 char *pp_name;
133
134 uint32_t pp_ctl_port;
135};
136
128struct port {
129 TAILQ_ENTRY(port) p_next;
130 TAILQ_ENTRY(port) p_pgs;
137struct port {
138 TAILQ_ENTRY(port) p_next;
139 TAILQ_ENTRY(port) p_pgs;
140 TAILQ_ENTRY(port) p_pps;
131 TAILQ_ENTRY(port) p_ts;
132 struct conf *p_conf;
133 char *p_name;
134 struct auth_group *p_auth_group;
135 struct portal_group *p_portal_group;
141 TAILQ_ENTRY(port) p_ts;
142 struct conf *p_conf;
143 char *p_name;
144 struct auth_group *p_auth_group;
145 struct portal_group *p_portal_group;
146 struct pport *p_pport;
136 struct target *p_target;
137
138 uint32_t p_ctl_port;
139};
140
141struct lun_option {
142 TAILQ_ENTRY(lun_option) lo_next;
143 struct lun *lo_lun;

--- 37 unchanged lines hidden (view full) ---

181
182struct conf {
183 char *conf_pidfile_path;
184 TAILQ_HEAD(, lun) conf_luns;
185 TAILQ_HEAD(, target) conf_targets;
186 TAILQ_HEAD(, auth_group) conf_auth_groups;
187 TAILQ_HEAD(, port) conf_ports;
188 TAILQ_HEAD(, portal_group) conf_portal_groups;
147 struct target *p_target;
148
149 uint32_t p_ctl_port;
150};
151
152struct lun_option {
153 TAILQ_ENTRY(lun_option) lo_next;
154 struct lun *lo_lun;

--- 37 unchanged lines hidden (view full) ---

192
193struct conf {
194 char *conf_pidfile_path;
195 TAILQ_HEAD(, lun) conf_luns;
196 TAILQ_HEAD(, target) conf_targets;
197 TAILQ_HEAD(, auth_group) conf_auth_groups;
198 TAILQ_HEAD(, port) conf_ports;
199 TAILQ_HEAD(, portal_group) conf_portal_groups;
200 TAILQ_HEAD(, pport) conf_pports;
189 TAILQ_HEAD(, isns) conf_isns;
190 int conf_isns_period;
191 int conf_isns_timeout;
192 int conf_debug;
193 int conf_timeout;
194 int conf_maxproc;
195
196#ifdef ICL_KERNEL_PROXY

--- 76 unchanged lines hidden (view full) ---

273
274struct rchap *rchap_new(const char *secret);
275int rchap_receive(struct rchap *rchap,
276 const char *id, const char *challenge);
277char *rchap_get_response(struct rchap *rchap);
278void rchap_delete(struct rchap *rchap);
279
280struct conf *conf_new(void);
201 TAILQ_HEAD(, isns) conf_isns;
202 int conf_isns_period;
203 int conf_isns_timeout;
204 int conf_debug;
205 int conf_timeout;
206 int conf_maxproc;
207
208#ifdef ICL_KERNEL_PROXY

--- 76 unchanged lines hidden (view full) ---

285
286struct rchap *rchap_new(const char *secret);
287int rchap_receive(struct rchap *rchap,
288 const char *id, const char *challenge);
289char *rchap_get_response(struct rchap *rchap);
290void rchap_delete(struct rchap *rchap);
291
292struct conf *conf_new(void);
281struct conf *conf_new_from_file(const char *path);
293struct conf *conf_new_from_file(const char *path, struct conf *old);
282struct conf *conf_new_from_kernel(void);
283void conf_delete(struct conf *conf);
284int conf_verify(struct conf *conf);
285
286struct auth_group *auth_group_new(struct conf *conf, const char *name);
287void auth_group_delete(struct auth_group *ag);
288struct auth_group *auth_group_find(const struct conf *conf,
289 const char *name);

--- 36 unchanged lines hidden (view full) ---

326 const char *addr);
327
328int isns_new(struct conf *conf, const char *addr);
329void isns_delete(struct isns *is);
330void isns_register(struct isns *isns, struct isns *oldisns);
331void isns_check(struct isns *isns);
332void isns_deregister(struct isns *isns);
333
294struct conf *conf_new_from_kernel(void);
295void conf_delete(struct conf *conf);
296int conf_verify(struct conf *conf);
297
298struct auth_group *auth_group_new(struct conf *conf, const char *name);
299void auth_group_delete(struct auth_group *ag);
300struct auth_group *auth_group_find(const struct conf *conf,
301 const char *name);

--- 36 unchanged lines hidden (view full) ---

338 const char *addr);
339
340int isns_new(struct conf *conf, const char *addr);
341void isns_delete(struct isns *is);
342void isns_register(struct isns *isns, struct isns *oldisns);
343void isns_check(struct isns *isns);
344void isns_deregister(struct isns *isns);
345
346struct pport *pport_new(struct conf *conf, const char *name,
347 uint32_t ctl_port);
348struct pport *pport_find(const struct conf *conf, const char *name);
349struct pport *pport_copy(struct pport *pport, struct conf *conf);
350void pport_delete(struct pport *pport);
351
334struct port *port_new(struct conf *conf, struct target *target,
335 struct portal_group *pg);
352struct port *port_new(struct conf *conf, struct target *target,
353 struct portal_group *pg);
354struct port *port_new_pp(struct conf *conf, struct target *target,
355 struct pport *pp);
336struct port *port_find(const struct conf *conf, const char *name);
337struct port *port_find_in_pg(const struct portal_group *pg,
338 const char *target);
339void port_delete(struct port *port);
340
341struct target *target_new(struct conf *conf, const char *name);
342void target_delete(struct target *target);
343struct target *target_find(struct conf *conf,

--- 82 unchanged lines hidden ---
356struct port *port_find(const struct conf *conf, const char *name);
357struct port *port_find_in_pg(const struct portal_group *pg,
358 const char *target);
359void port_delete(struct port *port);
360
361struct target *target_new(struct conf *conf, const char *name);
362void target_delete(struct target *target);
363struct target *target_find(struct conf *conf,

--- 82 unchanged lines hidden ---