...

Author: splitice

ipthelper/xshared.c

@@ -743,3 +743,66 @@ void command_jump(struct iptables_command_state *cs)
 				cs->target->real_name : cs->jumpto);
 	xt_params->opts = opts;
 }
+
+
+struct option *
+xs_merge_options(struct option *orig_opts, struct option *oldopts,
+	    const struct option *newopts, unsigned int *option_offset)
+{
+	unsigned int num_orig = 0, num_old = 0, num_new = 0, i;
+	struct option *merge;
+	struct option *mp;
+	struct option *old_base = oldopts;
+
+	if (newopts == NULL || newopts->name == NULL)
+		return oldopts;
+
+	if (orig_opts != NULL)
+		for (; orig_opts[num_orig].name != NULL; ++num_orig)
+			;
+
+	if (oldopts != NULL)
+		for (; oldopts[num_old].name != NULL; ++num_old)
+			;
+
+	for (; newopts[num_new].name != NULL; ++num_new)
+		;
+
+	if (oldopts != NULL && num_old >= num_orig) {
+		oldopts += num_orig;
+		num_old -= num_orig;
+	} else {
+		oldopts = NULL;
+		num_old = 0;
+	}
+
+	merge = malloc(sizeof(*merge) * (num_orig + num_new + num_old + 1));
+	if (merge == NULL)
+		return NULL;
+
+	if (num_orig != 0)
+		memcpy(merge, orig_opts, sizeof(*merge) * num_orig);
+	mp = merge + num_orig;
+
+	xt_params->option_offset += XT_OPTION_OFFSET_SCALE;
+	*option_offset = xt_params->option_offset;
+
+	for (i = 0; i < num_new; ++i, ++mp) {
+		mp->name    = newopts[i].name;
+		mp->has_arg = newopts[i].has_arg;
+		mp->flag    = newopts[i].flag;
+		mp->val     = newopts[i].val + *option_offset;
+	}
+
+	if (oldopts != NULL && num_old != 0) {
+		memcpy(mp, oldopts, sizeof(*mp) * num_old);
+		mp += num_old;
+	}
+
+	memset(mp, 0, sizeof(*mp));
+
+	if (old_base != NULL && old_base != orig_opts && old_base != xt_params->orig_opts)
+		free(old_base);
+
+	return merge;
+}

ipthelper/xtoptions.c

@@ -128,68 +128,6 @@ xtables_options_xfrm(struct option *orig_opts, struct option *oldopts,
 	return merge;
 }
 
-struct option *
-xs_merge_options(struct option *orig_opts, struct option *oldopts,
-	    const struct option *newopts, unsigned int *option_offset)
-{
-	unsigned int num_orig = 0, num_old = 0, num_new = 0, i;
-	struct option *merge;
-	struct option *mp;
-	struct option *old_base = oldopts;
-
-	if (newopts == NULL || newopts->name == NULL)
-		return oldopts;
-
-	if (orig_opts != NULL)
-		for (; orig_opts[num_orig].name != NULL; ++num_orig)
-			;
-
-	if (oldopts != NULL)
-		for (; oldopts[num_old].name != NULL; ++num_old)
-			;
-
-	for (; newopts[num_new].name != NULL; ++num_new)
-		;
-
-	if (oldopts != NULL && num_old >= num_orig) {
-		oldopts += num_orig;
-		num_old -= num_orig;
-	} else {
-		oldopts = NULL;
-		num_old = 0;
-	}
-
-	merge = malloc(sizeof(*merge) * (num_orig + num_new + num_old + 1));
-	if (merge == NULL)
-		return NULL;
-
-	if (num_orig != 0)
-		memcpy(merge, orig_opts, sizeof(*merge) * num_orig);
-	mp = merge + num_orig;
-
-	xt_params->option_offset += XT_OPTION_OFFSET_SCALE;
-	*option_offset = xt_params->option_offset;
-
-	for (i = 0; i < num_new; ++i, ++mp) {
-		mp->name    = newopts[i].name;
-		mp->has_arg = newopts[i].has_arg;
-		mp->flag    = newopts[i].flag;
-		mp->val     = newopts[i].val + *option_offset;
-	}
-
-	if (oldopts != NULL && num_old != 0) {
-		memcpy(mp, oldopts, sizeof(*mp) * num_old);
-		mp += num_old;
-	}
-
-	memset(mp, 0, sizeof(*mp));
-
-	if (old_base != NULL && old_base != orig_opts && old_base != xt_params->orig_opts)
-		free(old_base);
-
-	return merge;
-}
-
 /**
  * Give the upper limit for a certain type.
  */