{
static char dots[LNET_SINGLE_TEXTBUF_NOB];
static char dashes[LNET_SINGLE_TEXTBUF_NOB];
-
+
memset(dots, '.', sizeof(dots));
dots[sizeof(dots)-1] = 0;
memset(dashes, '-', sizeof(dashes));
dashes[sizeof(dashes)-1] = 0;
-
+
LCONSOLE_ERROR_MSG(0x10f, "Error parsing '%s=\"%s\"'\n", name, str);
- LCONSOLE_ERROR_MSG(0x110, "here...........%.*s..%.*s|%.*s|\n",
+ LCONSOLE_ERROR_MSG(0x110, "here...........%.*s..%.*s|%.*s|\n",
(int)strlen(name), dots, offset, dots,
(width < 1) ? 0 : width - 1, dashes);
}
-int
+int
lnet_issep (char c)
{
switch (c) {
void
lnet_ni_free(struct lnet_ni *ni)
{
+ int i;
+
if (ni->ni_refs != NULL)
cfs_percpt_free(ni->ni_refs);
pthread_mutex_destroy(&ni->ni_lock);
# endif
#endif
+ for (i = 0; i < LNET_MAX_INTERFACES &&
+ ni->ni_interfaces[i] != NULL; i++) {
+ LIBCFS_FREE(ni->ni_interfaces[i],
+ strlen(ni->ni_interfaces[i]) + 1);
+ }
LIBCFS_FREE(ni, sizeof(*ni));
}
return -EINVAL;
}
- LIBCFS_ALLOC(tokens, tokensize);
- if (tokens == NULL) {
- CERROR("Can't allocate net tokens\n");
+ LIBCFS_ALLOC(tokens, tokensize);
+ if (tokens == NULL) {
+ CERROR("Can't allocate net tokens\n");
return -ENOMEM;
- }
+ }
- the_lnet.ln_network_tokens = tokens;
- the_lnet.ln_network_tokens_nob = tokensize;
- memcpy (tokens, networks, tokensize);
+ memcpy(tokens, networks, tokensize);
str = tmp = tokens;
/* Add in the loopback network */
goto failed_syntax;
}
- if (niface == LNET_MAX_INTERFACES) {
- LCONSOLE_ERROR_MSG(0x115, "Too many interfaces "
- "for net %s\n",
- libcfs_net2str(net));
- goto failed;
- }
+ if (niface == LNET_MAX_INTERFACES) {
+ LCONSOLE_ERROR_MSG(0x115, "Too many interfaces "
+ "for net %s\n",
+ libcfs_net2str(net));
+ goto failed;
+ }
- ni->ni_interfaces[niface++] = iface;
+ /* Allocate a seperate piece of memory and copy
+ * into it the string, so we don't have
+ * a depencency on the tokens string. This way we
+ * can free the tokens at the end of the function.
+ * The newly allocated ni_interfaces[] can be
+ * freed when freeing the NI */
+ LIBCFS_ALLOC(ni->ni_interfaces[niface],
+ strlen(iface) + 1);
+ if (ni->ni_interfaces[niface] == NULL) {
+ CERROR("Can't allocate net interface name\n");
+ goto failed;
+ }
+ strncpy(ni->ni_interfaces[niface], iface,
+ strlen(iface));
+ niface++;
iface = comma;
} while (iface != NULL);
}
LASSERT(!list_empty(nilist));
+
+ LIBCFS_FREE(tokens, tokensize);
return 0;
failed_syntax:
cfs_expr_list_free(el);
LIBCFS_FREE(tokens, tokensize);
- the_lnet.ln_network_tokens = NULL;
return -EINVAL;
}
-struct lnet_text_buf *
-lnet_new_text_buf (int str_len)
+struct lnet_text_buf *lnet_new_text_buf(int str_len)
{
struct lnet_text_buf *ltb;
- int nob;
+ int nob;
- /* NB allocate space for the terminating 0 */
+ /* NB allocate space for the terminating 0 */
nob = offsetof(struct lnet_text_buf, ltb_text[str_len + 1]);
if (nob > LNET_SINGLE_TEXTBUF_NOB) {
/* _way_ conservative for "route net gateway..." */
CERROR("Too many text buffers\n");
return NULL;
}
-
+
LIBCFS_ALLOC(ltb, nob);
if (ltb == NULL)
return NULL;
ltb->ltb_size = nob;
- ltb->ltb_text[0] = 0;
+ ltb->ltb_text[0] = 0;
lnet_tbnob += nob;
return ltb;
}
/* skip leading whitespace */
while (cfs_iswhite(*str))
str++;
-
+
/* scan for separator or comment */
for (sep = str; *sep != 0; sep++)
if (lnet_issep(*sep) || *sep == '#')
lnet_free_text_bufs(&pending);
return -1;
}
-
+
for (i = 0; i < nob; i++)
if (cfs_iswhite(str[i]))
ltb->ltb_text[i] = ' ';
sep++;
} while (*sep != 0 && !lnet_issep(*sep));
}
-
+
if (*sep == 0)
break;
int
lnet_expand1tb(struct list_head *list,
- char *str, char *sep1, char *sep2,
+ char *str, char *sep1, char *sep2,
char *item, int itemlen)
{
int len1 = (int)(sep1 - str);
if (lnet_expand1tb(&pending, str, sep, sep2,
parsed, (int)(enditem - parsed)) != 0)
goto failed;
-
+
continue;
}
-
+
stride = 1;
}
if (enditem != parsed + scanned) /* no trailing junk */
goto failed;
-
- if (hi < 0 || lo < 0 || stride < 0 || hi < lo ||
+
+ if (hi < 0 || lo < 0 || stride < 0 || hi < lo ||
(hi - lo) % stride != 0)
goto failed;
-
+
for (i = lo; i <= hi; i += stride) {
snprintf(num, sizeof(num), "%d", i);
nob = strlen(num);
if (nob + 1 == sizeof(num))
goto failed;
-
- if (lnet_expand1tb(&pending, str, sep, sep2,
+
+ if (lnet_expand1tb(&pending, str, sep, sep2,
num, nob) != 0)
goto failed;
}
}
-
+
list_splice(&pending, tbs->prev);
return 1;
-
+
failed:
lnet_free_text_bufs(&pending);
return -1;
{
int len = strlen(str);
int nob = len;
-
+
return (sscanf(str, "%u%n", hops, &nob) >= 1 &&
nob == len &&
*hops > 0 && *hops < 256);
char *sep;
char *token = str;
int ntokens = 0;
- int myrc = -1;
- unsigned int hops;
- int got_hops = 0;
+ int myrc = -1;
+ unsigned int hops;
+ int got_hops = 0;
unsigned int priority = 0;
INIT_LIST_HEAD(&gateways);
INIT_LIST_HEAD(&nets);
/* save a copy of the string for error messages */
- strncpy(cmd, str, sizeof(cmd) - 1);
- cmd[sizeof(cmd) - 1] = 0;
+ strncpy(cmd, str, sizeof(cmd));
+ cmd[sizeof(cmd) - 1] = '\0';
sep = str;
for (;;) {
sep++;
if (*sep != 0)
*sep++ = 0;
-
+
if (ntokens == 1) {
tmp2 = &nets; /* expanding nets */
} else if (ntokens == 2 &&
} else {
tmp2 = &gateways; /* expanding gateways */
}
-
+
ltb = lnet_new_text_buf(strlen(token));
if (ltb == NULL)
goto out;
strcpy(ltb->ltb_text, token);
tmp1 = <b->ltb_list;
list_add_tail(tmp1, tmp2);
-
+
while (tmp1 != tmp2) {
ltb = list_entry(tmp1, struct lnet_text_buf, ltb_list);
goto token_error;
tmp1 = tmp1->next;
-
+
if (rc > 0) { /* expanded! */
list_del(<b->ltb_list);
lnet_free_text_buf(ltb);
}
}
- if (!got_hops)
- hops = 1;
+ if (!got_hops)
+ hops = 1;
LASSERT(!list_empty(&nets));
LASSERT(!list_empty(&gateways));
nid = libcfs_str2nid(ltb->ltb_text);
LASSERT(nid != LNET_NID_ANY);
- if (lnet_islocalnid(nid)) {
- *im_a_router = 1;
- continue;
- }
+ if (lnet_islocalnid(nid)) {
+ *im_a_router = 1;
+ continue;
+ }
rc = lnet_add_route(net, hops, nid, priority);
- if (rc != 0) {
- CERROR("Can't create route "
- "to %s via %s\n",
- libcfs_net2str(net),
- libcfs_nid2str(nid));
- goto out;
- }
+ if (rc != 0) {
+ CERROR("Can't create route "
+ "to %s via %s\n",
+ libcfs_net2str(net),
+ libcfs_nid2str(nid));
+ goto out;
+ }
}
}
- myrc = 0;
- goto out;
-
- token_error:
+ myrc = 0;
+ goto out;
+
+token_error:
lnet_syntax("routes", cmd, (int)(token - str), strlen(token));
- out:
+out:
lnet_free_text_bufs(&nets);
lnet_free_text_bufs(&gateways);
return myrc;
sep++;
if (*sep == 0)
break;
-
+
token = sep++;
-
+
/* scan for token end */
while (*sep != 0 && !cfs_iswhite(*sep))
sep++;
if (*sep != 0)
*sep++ = 0;
-
+
if (ntokens++ == 0) {
net = token;
continue;
matched |= (rc != 0);
}
-
+
if (!matched)
return 0;
-
+
strcpy(net_entry, net); /* replace with matched net */
return 1;
}
sep = strchr(tb->ltb_text, ',');
bracket = strchr(tb->ltb_text, '(');
- if (sep != NULL &&
- bracket != NULL &&
- bracket < sep) {
+ if (sep != NULL &&
+ bracket != NULL &&
+ bracket < sep) {
/* netspec lists interfaces... */
offset2 = offset + (int)(bracket - tb->ltb_text);
if (tb2 == tb)
continue;
-
+
if (net == lnet_netspec2net(tb2->ltb_text)) {
/* duplicate network */
lnet_syntax("ip2nets", source, offset,
return 0;
offset += (int)(sep - tb->ltb_text);
- tb2 = lnet_new_text_buf(strlen(sep));
- if (tb2 == NULL)
- return -ENOMEM;
+ len = strlen(sep);
+ tb2 = lnet_new_text_buf(len);
+ if (tb2 == NULL)
+ return -ENOMEM;
- strncpy(tb2->ltb_text, sep, strlen(sep));
+ strncpy(tb2->ltb_text, sep, len);
+ tb2->ltb_text[len] = '\0';
list_add_tail(&tb2->ltb_list, nets);
tb = tb2;
tb = list_entry(raw_entries.next, struct lnet_text_buf,
ltb_list);
- strncpy(source, tb->ltb_text, sizeof(source)-1);
- source[sizeof(source)-1] = 0;
+ strncpy(source, tb->ltb_text, sizeof(source));
+ source[sizeof(source) - 1] = '\0';
/* replace ltb_text with the network(s) add on match */
rc = lnet_match_network_tokens(tb->ltb_text, ipaddrs, nip);
list_for_each_safe(t, t2, ¤t_nets) {
tb = list_entry(t, struct lnet_text_buf, ltb_list);
-
+
list_del(&tb->ltb_list);
list_add_tail(&tb->ltb_list, &matched_nets);
- len += snprintf(networks + len, sizeof(networks) - len,
- "%s%s", (len == 0) ? "" : ",",
- tb->ltb_text);
-
+ len += snprintf(networks + len, sizeof(networks) - len,
+ "%s%s", (len == 0) ? "" : ",",
+ tb->ltb_text);
+
if (len >= sizeof(networks)) {
CERROR("Too many matched networks\n");
rc = -E2BIG;
goto out;
}
}
-
+
count++;
}
CERROR("Can't allocate ipaddrs[%d]\n", nip);
nip = -ENOMEM;
} else {
- memcpy(ipaddrs2, ipaddrs,
- nip * sizeof(*ipaddrs));
+ memcpy(ipaddrs2, ipaddrs,
+ nip * sizeof(*ipaddrs));
*ipaddrsp = ipaddrs2;
rc = nip;
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff