|
22 | 22 | #include <unordered_map> |
23 | 23 | #include <utility> |
24 | 24 |
|
| 25 | +#include "action_msgs/srv/cancel_goal.hpp" |
25 | 26 | #include "rcl/event_callback.h" |
26 | 27 | #include "rcl_action/action_server.h" |
27 | 28 | #include "rosidl_runtime_c/action_type_support_struct.h" |
@@ -77,6 +78,7 @@ class ServerBase : public rclcpp::Waitable |
77 | 78 | GoalService, |
78 | 79 | ResultService, |
79 | 80 | CancelService, |
| 81 | + Expired, |
80 | 82 | }; |
81 | 83 |
|
82 | 84 | RCLCPP_ACTION_PUBLIC |
@@ -279,19 +281,25 @@ class ServerBase : public rclcpp::Waitable |
279 | 281 | /// \internal |
280 | 282 | RCLCPP_ACTION_PUBLIC |
281 | 283 | void |
282 | | - execute_goal_request_received(std::shared_ptr<void> & data); |
| 284 | + execute_goal_request_received( |
| 285 | + rcl_ret_t ret, rcl_action_goal_info_t goal_info, rmw_request_id_t request_header, |
| 286 | + std::shared_ptr<void> message); |
283 | 287 |
|
284 | 288 | /// Handle a request to cancel goals on the server |
285 | 289 | /// \internal |
286 | 290 | RCLCPP_ACTION_PUBLIC |
287 | 291 | void |
288 | | - execute_cancel_request_received(std::shared_ptr<void> & data); |
| 292 | + execute_cancel_request_received( |
| 293 | + rcl_ret_t ret, std::shared_ptr<action_msgs::srv::CancelGoal::Request> request, |
| 294 | + rmw_request_id_t request_header); |
289 | 295 |
|
290 | 296 | /// Handle a request to get the result of an action |
291 | 297 | /// \internal |
292 | 298 | RCLCPP_ACTION_PUBLIC |
293 | 299 | void |
294 | | - execute_result_request_received(std::shared_ptr<void> & data); |
| 300 | + execute_result_request_received( |
| 301 | + rcl_ret_t ret, std::shared_ptr<void> result_request, |
| 302 | + rmw_request_id_t request_header); |
295 | 303 |
|
296 | 304 | /// Handle a timeout indicating a completed goal should be forgotten by the server |
297 | 305 | /// \internal |
|
0 commit comments