The original patch had issues that resulted in segfaults when incoming encapsulated packets were missing particular options. Attached is a revised patch correcting that.