Attachment 292671 Details for Bug 429763 – Handle re-add of existing routes

[patch] Handle re-add of existing routes

libdhcp_AM.patch (text/plain), 1.01 KB, created by Gary Thomas on 2008-01-23 17:02:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gary Thomas

Created: 2008-01-23 17:02:27 UTC

Size: 1.01 KB

patch

obsolete

>--- libdhcp-1.99.5.ORIG/src/nic.c	2008-01-03 14:00:02.000000000 -0700
>+++ libdhcp-1.99.5/src/nic.c	2008-01-15 07:25:29.000000000 -0700
>@@ -2545,18 +2545,25 @@
>     return NIC_FAIL;
> }
> 
>-NIC_Res_t nic_add_route(IProute_t rt) {
>+NIC_Res_t nic_update_route(IProute_t rt) {
>     if (rt == NULL)
>         return NIC_FAIL;
> 
>-    return nic_route_msg(rt, "nic_add_route", "add", RTM_NEWROUTE, NLM_F_CREATE | NLM_F_REPLACE);
>+    return nic_route_msg(rt, "nic_update_route", "update", RTM_NEWROUTE, NLM_F_REPLACE);
> }
> 
>-NIC_Res_t nic_update_route(IProute_t rt) {
>+NIC_Res_t nic_add_route(IProute_t rt) {
>+    NIC_Res_t res;
>     if (rt == NULL)
>         return NIC_FAIL;
> 
>-    return nic_route_msg(rt, "nic_update_route", "update", RTM_NEWROUTE, NLM_F_REPLACE);
>+    res = nic_route_msg(rt, "nic_add_route", "add", RTM_NEWROUTE, NLM_F_CREATE | NLM_F_REPLACE);
>+    if (res == NIC_FAIL) {
>+      if (nl_get_errno() == EEXIST) {
>+	res = nic_update_route(rt);
>+      }
>+    }
>+    return res;
> }
> 
> NIC_Res_t nic_remove_route(IProute_t rt) {

Actions: View | Diff

Attachments on bug 429763: 292559 | 292671