[sr-dev] git:master:fbfe3442: xcap_server: reformat exported structures