From d0184cb25c30a123bb73492f894840f879764164 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Fri, 6 Feb 2009 21:44:19 +0200 Subject: [PATCH] UPnP: Renamed PutWLANResponse callback function to match action No point in adding extra "event_" to the name. --- hostapd/wps_hostapd.c | 5 ++--- src/wps/wps_upnp.h | 2 +- src/wps/wps_upnp_web.c | 8 ++++---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/hostapd/wps_hostapd.c b/hostapd/wps_hostapd.c index d32ee26b0..326a807d4 100644 --- a/hostapd/wps_hostapd.c +++ b/hostapd/wps_hostapd.c @@ -853,7 +853,7 @@ static int hostapd_rx_req_del_sta_settings(void *priv, } -static int hostapd_rx_req_put_wlan_event_response( +static int hostapd_rx_req_put_wlan_response( void *priv, enum upnp_wps_wlanevent_type ev_type, const u8 *mac_addr, const struct wpabuf *msg, enum wps_msg_type msg_type) @@ -965,8 +965,7 @@ static int hostapd_wps_upnp_init(struct hostapd_data *hapd, ctx->rx_req_get_sta_settings = hostapd_rx_req_get_sta_settings; ctx->rx_req_set_sta_settings = hostapd_rx_req_set_sta_settings; ctx->rx_req_del_sta_settings = hostapd_rx_req_del_sta_settings; - ctx->rx_req_put_wlan_event_response = - hostapd_rx_req_put_wlan_event_response; + ctx->rx_req_put_wlan_response = hostapd_rx_req_put_wlan_response; ctx->rx_req_set_selected_registrar = hostapd_rx_req_set_selected_registrar; ctx->rx_req_reboot_ap = hostapd_rx_req_reboot_ap; diff --git a/src/wps/wps_upnp.h b/src/wps/wps_upnp.h index eb3397e6f..31b055628 100644 --- a/src/wps/wps_upnp.h +++ b/src/wps/wps_upnp.h @@ -38,7 +38,7 @@ struct upnp_wps_device_ctx { const struct wpabuf *msg); int (*rx_req_set_sta_settings)(void *priv, const struct wpabuf *msg); int (*rx_req_del_sta_settings)(void *priv, const struct wpabuf *msg); - int (*rx_req_put_wlan_event_response)( + int (*rx_req_put_wlan_response)( void *priv, enum upnp_wps_wlanevent_type ev_type, const u8 *mac_addr, const struct wpabuf *msg, enum wps_msg_type msg_type); diff --git a/src/wps/wps_upnp_web.c b/src/wps/wps_upnp_web.c index 241afaa5f..db47c29ea 100644 --- a/src/wps/wps_upnp_web.c +++ b/src/wps/wps_upnp_web.c @@ -1029,11 +1029,11 @@ web_process_put_wlan_response(struct upnp_wps_device_sm *sm, char *data, wpa_printf(MSG_DEBUG, "WPS UPnP: Message Type %d", type); } else type = -1; - if (!sm->ctx->rx_req_put_wlan_event_response || - sm->ctx->rx_req_put_wlan_event_response(sm->priv, ev_type, - macaddr, msg, type)) { + if (!sm->ctx->rx_req_put_wlan_response || + sm->ctx->rx_req_put_wlan_response(sm->priv, ev_type, macaddr, msg, + type)) { wpa_printf(MSG_INFO, "WPS UPnP: Fail: sm->ctx->" - "rx_req_put_wlan_event_response"); + "rx_req_put_wlan_response"); wpabuf_free(msg); return HTTP_INTERNAL_SERVER_ERROR; }