29c29
< * $FreeBSD: stable/10/usr.sbin/ctld/ctld.h 279006 2015-02-19 14:52:01Z mav $
---
> * $FreeBSD: stable/10/usr.sbin/ctld/ctld.h 279055 2015-02-20 17:09:49Z mav $
127a128,136
> struct pport {
> TAILQ_ENTRY(pport) pp_next;
> TAILQ_HEAD(, port) pp_ports;
> struct conf *pp_conf;
> char *pp_name;
>
> uint32_t pp_ctl_port;
> };
>
130a140
> TAILQ_ENTRY(port) p_pps;
135a146
> struct pport *p_pport;
188a200
> TAILQ_HEAD(, pport) conf_pports;
281c293
< struct conf *conf_new_from_file(const char *path);
---
> struct conf *conf_new_from_file(const char *path, struct conf *old);
333a346,351
> struct pport *pport_new(struct conf *conf, const char *name,
> uint32_t ctl_port);
> struct pport *pport_find(const struct conf *conf, const char *name);
> struct pport *pport_copy(struct pport *pport, struct conf *conf);
> void pport_delete(struct pport *pport);
>
335a354,355
> struct port *port_new_pp(struct conf *conf, struct target *target,
> struct pport *pp);