Rename get_supported_protocols to protover_get_supported_protocols

diff --git a/src/or/protover.c b/src/or/protover.c
index 434d3f36bebe66d4b60d1f1634a63511632c2af8..a2471b0c01493792aa8ee3ed4af11cdd19110917 100644 (file)
--- a/src/or/protover.c
+++ b/src/or/protover.c
@@ -260,7 +260,7 @@ protocol_list_supports_protocol(const char *list, protocol_type_t tp,
 /** Return the canonical string containing the list of protocols
  * that we support. */
 const char *
-get_supported_protocols(void)
+protover_get_supported_protocols(void)
 {
   return
     "Cons=1-2 "
@@ -274,8 +274,9 @@ get_supported_protocols(void)
     "Relay=1-2";
 }
 
-/** The protocols from get_supported_protocols(), as parsed into a list of
- * proto_entry_t values. Access this via get_supported_protocol_list. */
+/** The protocols from protover_get_supported_protocols(), as parsed into a
+ * list of proto_entry_t values. Access this via
+ * get_supported_protocol_list. */
 static smartlist_t *supported_protocol_list = NULL;
 
 /** Return a pointer to a smartlist of proto_entry_t for the protocols
@@ -284,7 +285,8 @@ static const smartlist_t *
 get_supported_protocol_list(void)
 {
   if (PREDICT_UNLIKELY(supported_protocol_list == NULL)) {
-    supported_protocol_list = parse_protocol_list(get_supported_protocols());
+    supported_protocol_list =
+      parse_protocol_list(protover_get_supported_protocols());
   }
   return supported_protocol_list;
 }

diff --git a/src/or/protover.h b/src/or/protover.h
index 654127ee541516eeb7826676a80534c84cdef2a8..5f4789d71e0393e1df86c5035a1c54b6305ee194 100644 (file)
--- a/src/or/protover.h
+++ b/src/or/protover.h
@@ -25,7 +25,7 @@ typedef enum protocol_type_t {
 
 int protover_all_supported(const char *s, char **missing);
 int protover_is_supported_here(protocol_type_t pr, uint32_t ver);
-const char *get_supported_protocols(void);
+const char *protover_get_supported_protocols(void);
 
 char *protover_compute_vote(const smartlist_t *list_of_proto_strings,
                             int threshold);

diff --git a/src/or/router.c b/src/or/router.c
index 7f227b5bec3c1ce7da644818769a5677c17a652f..1449b57619b36f47870c937795a2a592338d9a3e 100644 (file)
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -2125,7 +2125,7 @@ router_build_fresh_descriptor(routerinfo_t **r, extrainfo_t **e)
   get_platform_str(platform, sizeof(platform));
   ri->platform = tor_strdup(platform);
 
-  ri->protocol_list = tor_strdup(get_supported_protocols());
+  ri->protocol_list = tor_strdup(protover_get_supported_protocols());
 
   /* compute ri->bandwidthrate as the min of various options */
   ri->bandwidthrate = get_effective_bwrate(options);