diff options
| author | Sander Vrijders <[email protected]> | 2016-06-14 14:56:55 +0200 |
|---|---|---|
| committer | Sander Vrijders <[email protected]> | 2016-06-14 14:56:55 +0200 |
| commit | 337ab9fe73b86306b72b9eaae3b7be759f7bbd36 (patch) | |
| tree | d7b237631ef17df911ec4aef766aba085a63bd30 /include | |
| parent | 6019a5b1ee574c8cea485ce5ba68ff77a24b4786 (diff) | |
| parent | 6271d09bdd17114c3095b7e819a7bcded14f26a5 (diff) | |
| download | ouroboros-337ab9fe73b86306b72b9eaae3b7be759f7bbd36.tar.gz ouroboros-337ab9fe73b86306b72b9eaae3b7be759f7bbd36.zip | |
Merge remote-tracking branch 'upstream/be' into be-llc
Diffstat (limited to 'include')
| -rw-r--r-- | include/ouroboros/dev.h | 8 | ||||
| -rw-r--r-- | include/ouroboros/ipcp.h | 2 | ||||
| -rw-r--r-- | include/ouroboros/irm.h | 18 | ||||
| -rw-r--r-- | include/ouroboros/utils.h | 3 |
4 files changed, 17 insertions, 14 deletions
diff --git a/include/ouroboros/dev.h b/include/ouroboros/dev.h index 506fa789..ee253ff8 100644 --- a/include/ouroboros/dev.h +++ b/include/ouroboros/dev.h @@ -36,12 +36,8 @@ int ap_init(char * ap_name); void ap_fini(void); -/* Returns file descriptor */ -int ap_reg(char ** difs, size_t difs_size); -int ap_unreg(char ** difs, size_t difs_size); - -/* Returns file descriptor (> 0) and client name(s) */ -int flow_accept(int fd, char ** ap_name, char ** ae_name); +/* Returns file descriptor (> 0) and client AE name */ +int flow_accept(char ** ae_name); int flow_alloc_resp(int fd, int result); /* Returns file descriptor */ diff --git a/include/ouroboros/ipcp.h b/include/ouroboros/ipcp.h index 08bee33e..89b9fa92 100644 --- a/include/ouroboros/ipcp.h +++ b/include/ouroboros/ipcp.h @@ -63,7 +63,6 @@ int ipcp_flow_alloc(pid_t pid, int port_id, pid_t n_pid, char * dst_name, - char * src_ap_name, char * src_ae_name, enum qos_cube qos); int ipcp_flow_alloc_resp(pid_t pid, @@ -76,7 +75,6 @@ int ipcp_flow_alloc_resp(pid_t pid, /* Returns the port_id */ int ipcp_flow_req_arr(pid_t pid, char * dst_name, - char * src_ap_name, char * src_ae_name); int ipcp_flow_alloc_reply(pid_t pid, int port_id, diff --git a/include/ouroboros/irm.h b/include/ouroboros/irm.h index 37524098..9d547643 100644 --- a/include/ouroboros/irm.h +++ b/include/ouroboros/irm.h @@ -39,10 +39,16 @@ int irm_enroll_ipcp(instance_name_t * api, int irm_bootstrap_ipcp(instance_name_t * api, struct dif_config * conf); -int irm_reg_ipcp(instance_name_t * api, - char ** difs, - size_t difs_size); -int irm_unreg_ipcp(const instance_name_t * api, - char ** difs, - size_t difs_size); +int irm_reg(char * name, + instance_name_t * api, + int argc, + char ** argv, + bool autoexec, + char ** difs, + size_t difs_size); +int irm_unreg(char * name, + const instance_name_t * api, + char ** difs, + size_t difs_size, + bool hard); #endif /* OUROBOROS_IRM_H */ diff --git a/include/ouroboros/utils.h b/include/ouroboros/utils.h index a1d2ac96..17bd41ee 100644 --- a/include/ouroboros/utils.h +++ b/include/ouroboros/utils.h @@ -31,3 +31,6 @@ int n_digits(unsigned i); /* Returns a copy of the source string */ char * strdup(const char * src); + +/* gets the application name */ +char * path_strip(char * src); |