Add derpc_transport_string_by_transport(), apply some const

diff --git a/librpc/rpc/binding.c b/librpc/rpc/binding.c
index dff2426b4879113afb6838409352d65768ea9b58..ba992399cdaf700509b37ce5d0d041077d9d2e58 100644 (file)
--- a/librpc/rpc/binding.c
+++ b/librpc/rpc/binding.c
@@ -176,11 +176,7 @@ _PUBLIC_ char *dcerpc_binding_string(TALLOC_CTX *mem_ctx, const struct dcerpc_bi
        const char *t_name = NULL;
 
        if (b->transport != NCA_UNKNOWN) {
-               for (i=0;i<ARRAY_SIZE(transports);i++) {
-                       if (transports[i].transport == b->transport) {
-                               t_name = transports[i].name;
-                       }
-               }
+               t_name = derpc_transport_string_by_transport(b->transport);
                if (!t_name) {
                        return NULL;
                }
@@ -572,7 +568,7 @@ enum dcerpc_transport_t dcerpc_transport_by_endpoint_protocol(int prot)
        return (unsigned int)-1;
 }
 
-_PUBLIC_ enum dcerpc_transport_t dcerpc_transport_by_tower(struct epm_tower *tower)
+_PUBLIC_ enum dcerpc_transport_t dcerpc_transport_by_tower(const struct epm_tower *tower)
 {
        int i;
 
@@ -598,6 +594,18 @@ _PUBLIC_ enum dcerpc_transport_t dcerpc_transport_by_tower(struct epm_tower *tow
        return (unsigned int)-1;
 }
 
+_PUBLIC_ const char *derpc_transport_string_by_transport(enum dcerpc_transport_t t)
+{
+       int i;
+
+       for (i=0; i<ARRAY_SIZE(transports); i++) {
+               if (t == transports[i].transport) {
+                       return transports[i].name;
+               }
+       }
+       return NULL;
+}
+
 _PUBLIC_ NTSTATUS dcerpc_binding_from_tower(TALLOC_CTX *mem_ctx, 
                                   struct epm_tower *tower, 
                                   struct dcerpc_binding **b_out)

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 2a7547334cc9396b8bf8e796daee9d84c1ef33b5..e65369e4210ad6ed50a73f27d05e63d9425374f4 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -2292,7 +2292,8 @@ _PUBLIC_ NTSTATUS dcerpc_floor_get_lhs_data(const struct epm_floor *epm_floor,
                                            struct ndr_syntax_id *syntax);
 const char *dcerpc_floor_get_rhs_data(TALLOC_CTX *mem_ctx, struct epm_floor *epm_floor);
 enum dcerpc_transport_t dcerpc_transport_by_endpoint_protocol(int prot);
-_PUBLIC_ enum dcerpc_transport_t dcerpc_transport_by_tower(struct epm_tower *tower);
+_PUBLIC_ enum dcerpc_transport_t dcerpc_transport_by_tower(const struct epm_tower *tower);
+_PUBLIC_ const char *derpc_transport_string_by_transport(enum dcerpc_transport_t t);
 _PUBLIC_ NTSTATUS dcerpc_binding_from_tower(TALLOC_CTX *mem_ctx, 
                                   struct epm_tower *tower, 
                                   struct dcerpc_binding **b_out);

diff --git a/source4/librpc/rpc/dcerpc.h b/source4/librpc/rpc/dcerpc.h
index 248b4f91be8471ef3ac22bd3fb3979f40435a9df..b2e3a8ce69c99ee837d03259b8be9e12ea11274e 100644 (file)
--- a/source4/librpc/rpc/dcerpc.h
+++ b/source4/librpc/rpc/dcerpc.h
@@ -359,7 +359,8 @@ NTSTATUS dcerpc_binding_build_tower(TALLOC_CTX *mem_ctx,
 
 NTSTATUS dcerpc_floor_get_lhs_data(const struct epm_floor *epm_floor, struct ndr_syntax_id *syntax);
 
-enum dcerpc_transport_t dcerpc_transport_by_tower(struct epm_tower *tower);
+enum dcerpc_transport_t dcerpc_transport_by_tower(const struct epm_tower *tower);
+const char *derpc_transport_string_by_transport(enum dcerpc_transport_t t);
 
 NTSTATUS dcerpc_ndr_request(struct dcerpc_pipe *p,
                            const struct GUID *object,