diff options
Diffstat (limited to 'src/hello/address.c')
-rw-r--r-- | src/hello/address.c | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/src/hello/address.c b/src/hello/address.c index 3936a0133..e22f3850f 100644 --- a/src/hello/address.c +++ b/src/hello/address.c | |||
@@ -36,8 +36,8 @@ | |||
36 | * @return #GNUNET_YES or #GNUNET_NO | 36 | * @return #GNUNET_YES or #GNUNET_NO |
37 | */ | 37 | */ |
38 | int | 38 | int |
39 | GNUNET_HELLO_address_check_option(const struct GNUNET_HELLO_Address * address, | 39 | GNUNET_HELLO_address_check_option (const struct GNUNET_HELLO_Address *address, |
40 | enum GNUNET_HELLO_AddressInfo option) | 40 | enum GNUNET_HELLO_AddressInfo option) |
41 | { | 41 | { |
42 | if (option == (address->local_info & option)) | 42 | if (option == (address->local_info & option)) |
43 | return GNUNET_YES; | 43 | return GNUNET_YES; |
@@ -52,10 +52,10 @@ GNUNET_HELLO_address_check_option(const struct GNUNET_HELLO_Address * address, | |||
52 | * @return the size | 52 | * @return the size |
53 | */ | 53 | */ |
54 | size_t | 54 | size_t |
55 | GNUNET_HELLO_address_get_size(const struct GNUNET_HELLO_Address * address) | 55 | GNUNET_HELLO_address_get_size (const struct GNUNET_HELLO_Address *address) |
56 | { | 56 | { |
57 | return sizeof(struct GNUNET_HELLO_Address) + address->address_length + | 57 | return sizeof(struct GNUNET_HELLO_Address) + address->address_length |
58 | strlen(address->transport_name) + 1; | 58 | + strlen (address->transport_name) + 1; |
59 | } | 59 | } |
60 | 60 | ||
61 | 61 | ||
@@ -70,31 +70,31 @@ GNUNET_HELLO_address_get_size(const struct GNUNET_HELLO_Address * address) | |||
70 | * @return the address struct | 70 | * @return the address struct |
71 | */ | 71 | */ |
72 | struct GNUNET_HELLO_Address * | 72 | struct GNUNET_HELLO_Address * |
73 | GNUNET_HELLO_address_allocate(const struct GNUNET_PeerIdentity *peer, | 73 | GNUNET_HELLO_address_allocate (const struct GNUNET_PeerIdentity *peer, |
74 | const char *transport_name, | 74 | const char *transport_name, |
75 | const void *address, | 75 | const void *address, |
76 | size_t address_length, | 76 | size_t address_length, |
77 | enum GNUNET_HELLO_AddressInfo local_info) | 77 | enum GNUNET_HELLO_AddressInfo local_info) |
78 | { | 78 | { |
79 | struct GNUNET_HELLO_Address *addr; | 79 | struct GNUNET_HELLO_Address *addr; |
80 | size_t slen; | 80 | size_t slen; |
81 | char *end; | 81 | char *end; |
82 | 82 | ||
83 | slen = strlen(transport_name) + 1; | 83 | slen = strlen (transport_name) + 1; |
84 | addr = GNUNET_malloc(sizeof(struct GNUNET_HELLO_Address) + | 84 | addr = GNUNET_malloc (sizeof(struct GNUNET_HELLO_Address) |
85 | address_length + slen); | 85 | + address_length + slen); |
86 | addr->peer = *peer; | 86 | addr->peer = *peer; |
87 | addr->address = &addr[1]; | 87 | addr->address = &addr[1]; |
88 | addr->address_length = address_length; | 88 | addr->address_length = address_length; |
89 | addr->local_info = local_info; | 89 | addr->local_info = local_info; |
90 | end = (char *)&addr[1]; | 90 | end = (char *) &addr[1]; |
91 | addr->transport_name = &end[address_length]; | 91 | addr->transport_name = &end[address_length]; |
92 | GNUNET_memcpy(end, | 92 | GNUNET_memcpy (end, |
93 | address, | 93 | address, |
94 | address_length); | 94 | address_length); |
95 | GNUNET_memcpy(&end[address_length], | 95 | GNUNET_memcpy (&end[address_length], |
96 | transport_name, | 96 | transport_name, |
97 | slen); | 97 | slen); |
98 | return addr; | 98 | return addr; |
99 | } | 99 | } |
100 | 100 | ||
@@ -106,15 +106,15 @@ GNUNET_HELLO_address_allocate(const struct GNUNET_PeerIdentity *peer, | |||
106 | * @return a copy of the address struct | 106 | * @return a copy of the address struct |
107 | */ | 107 | */ |
108 | struct GNUNET_HELLO_Address * | 108 | struct GNUNET_HELLO_Address * |
109 | GNUNET_HELLO_address_copy(const struct GNUNET_HELLO_Address *address) | 109 | GNUNET_HELLO_address_copy (const struct GNUNET_HELLO_Address *address) |
110 | { | 110 | { |
111 | if (NULL == address) | 111 | if (NULL == address) |
112 | return NULL; | 112 | return NULL; |
113 | return GNUNET_HELLO_address_allocate(&address->peer, | 113 | return GNUNET_HELLO_address_allocate (&address->peer, |
114 | address->transport_name, | 114 | address->transport_name, |
115 | address->address, | 115 | address->address, |
116 | address->address_length, | 116 | address->address_length, |
117 | address->local_info); | 117 | address->local_info); |
118 | } | 118 | } |
119 | 119 | ||
120 | 120 | ||
@@ -127,8 +127,8 @@ GNUNET_HELLO_address_copy(const struct GNUNET_HELLO_Address *address) | |||
127 | * @return 0 if the addresses are equal, -1 if a1<a2, 1 if a1>a2. | 127 | * @return 0 if the addresses are equal, -1 if a1<a2, 1 if a1>a2. |
128 | */ | 128 | */ |
129 | int | 129 | int |
130 | GNUNET_HELLO_address_cmp(const struct GNUNET_HELLO_Address *a1, | 130 | GNUNET_HELLO_address_cmp (const struct GNUNET_HELLO_Address *a1, |
131 | const struct GNUNET_HELLO_Address *a2) | 131 | const struct GNUNET_HELLO_Address *a2) |
132 | { | 132 | { |
133 | int ret; | 133 | int ret; |
134 | 134 | ||
@@ -139,18 +139,18 @@ GNUNET_HELLO_address_cmp(const struct GNUNET_HELLO_Address *a1, | |||
139 | return 1; | 139 | return 1; |
140 | if (NULL == a2) | 140 | if (NULL == a2) |
141 | return -1; | 141 | return -1; |
142 | ret = strcmp(a1->transport_name, a2->transport_name); | 142 | ret = strcmp (a1->transport_name, a2->transport_name); |
143 | if (0 != ret) | 143 | if (0 != ret) |
144 | return ret; | 144 | return ret; |
145 | if (a1->local_info != a2->local_info) | 145 | if (a1->local_info != a2->local_info) |
146 | return (((int)a1->local_info) < ((int)a2->local_info)) ? -1 : 1; | 146 | return (((int) a1->local_info) < ((int) a2->local_info)) ? -1 : 1; |
147 | if (a1->address_length < a2->address_length) | 147 | if (a1->address_length < a2->address_length) |
148 | return -1; | 148 | return -1; |
149 | if (a1->address_length > a2->address_length) | 149 | if (a1->address_length > a2->address_length) |
150 | return 1; | 150 | return 1; |
151 | return memcmp(a1->address, | 151 | return memcmp (a1->address, |
152 | a2->address, | 152 | a2->address, |
153 | a1->address_length); | 153 | a1->address_length); |
154 | } | 154 | } |
155 | 155 | ||
156 | 156 | ||