Deleted Added
full compact
ctld.h (274866) ctld.h (274939)
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 274866 2014-11-22 17:39:39Z trasz $
29 * $FreeBSD: stable/10/usr.sbin/ctld/ctld.h 274939 2014-11-24 00:47:04Z 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>

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

141 TAILQ_HEAD(, lun) t_luns;
142 struct conf *t_conf;
143 struct auth_group *t_auth_group;
144 struct portal_group *t_portal_group;
145 char *t_name;
146 char *t_alias;
147};
148
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>

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

141 TAILQ_HEAD(, lun) t_luns;
142 struct conf *t_conf;
143 struct auth_group *t_auth_group;
144 struct portal_group *t_portal_group;
145 char *t_name;
146 char *t_alias;
147};
148
149struct isns {
150 TAILQ_ENTRY(isns) i_next;
151 struct conf *i_conf;
152 char *i_addr;
153 struct addrinfo *i_ai;
154};
155
149struct conf {
150 char *conf_pidfile_path;
151 TAILQ_HEAD(, target) conf_targets;
152 TAILQ_HEAD(, auth_group) conf_auth_groups;
153 TAILQ_HEAD(, portal_group) conf_portal_groups;
156struct conf {
157 char *conf_pidfile_path;
158 TAILQ_HEAD(, target) conf_targets;
159 TAILQ_HEAD(, auth_group) conf_auth_groups;
160 TAILQ_HEAD(, portal_group) conf_portal_groups;
161 TAILQ_HEAD(, isns) conf_isns;
162 int conf_isns_period;
163 int conf_isns_timeout;
154 int conf_debug;
155 int conf_timeout;
156 int conf_maxproc;
157
158 uint16_t conf_last_portal_group_tag;
159#ifdef ICL_KERNEL_PROXY
160 int conf_portal_id;
161#endif

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

272
273struct portal_group *portal_group_new(struct conf *conf, const char *name);
274void portal_group_delete(struct portal_group *pg);
275struct portal_group *portal_group_find(const struct conf *conf,
276 const char *name);
277int portal_group_add_listen(struct portal_group *pg,
278 const char *listen, bool iser);
279
164 int conf_debug;
165 int conf_timeout;
166 int conf_maxproc;
167
168 uint16_t conf_last_portal_group_tag;
169#ifdef ICL_KERNEL_PROXY
170 int conf_portal_id;
171#endif

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

282
283struct portal_group *portal_group_new(struct conf *conf, const char *name);
284void portal_group_delete(struct portal_group *pg);
285struct portal_group *portal_group_find(const struct conf *conf,
286 const char *name);
287int portal_group_add_listen(struct portal_group *pg,
288 const char *listen, bool iser);
289
290int isns_new(struct conf *conf, const char *addr);
291void isns_delete(struct isns *is);
292void isns_register(struct isns *isns, struct isns *oldisns);
293void isns_check(struct isns *isns);
294void isns_deregister(struct isns *isns);
295
280struct target *target_new(struct conf *conf, const char *name);
281void target_delete(struct target *target);
282struct target *target_find(struct conf *conf,
283 const char *name);
284
285struct lun *lun_new(struct target *target, int lun_id);
286void lun_delete(struct lun *lun);
287struct lun *lun_find(const struct target *target, int lun_id);

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

349void log_errx(int, const char *, ...)
350 __dead2 __printflike(2, 3);
351void log_warn(const char *, ...) __printflike(1, 2);
352void log_warnx(const char *, ...) __printflike(1, 2);
353void log_debugx(const char *, ...) __printflike(1, 2);
354
355char *checked_strdup(const char *);
356bool valid_iscsi_name(const char *name);
296struct target *target_new(struct conf *conf, const char *name);
297void target_delete(struct target *target);
298struct target *target_find(struct conf *conf,
299 const char *name);
300
301struct lun *lun_new(struct target *target, int lun_id);
302void lun_delete(struct lun *lun);
303struct lun *lun_find(const struct target *target, int lun_id);

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

365void log_errx(int, const char *, ...)
366 __dead2 __printflike(2, 3);
367void log_warn(const char *, ...) __printflike(1, 2);
368void log_warnx(const char *, ...) __printflike(1, 2);
369void log_debugx(const char *, ...) __printflike(1, 2);
370
371char *checked_strdup(const char *);
372bool valid_iscsi_name(const char *name);
373void set_timeout(int timeout, int fatal);
357bool timed_out(void);
358
359#endif /* !CTLD_H */
374bool timed_out(void);
375
376#endif /* !CTLD_H */