Sorry, I mean fw_handle_hipd_message() and hip_handle_user_msg(). It seems that the beginning of the functions is copy paste. You could extract the beginning into another function and call it in the other two. -- https://code.launchpad.net/~martin-lp/hipl/hipfwconf/+merge/80830 Your team HIPL core team is subscribed to branch lp:hipl.